From patchwork Fri Sep 15 09:37:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 140444 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp1067272vqi; Fri, 15 Sep 2023 07:01:51 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHRtVcLFdakzfRlM68cJzSETP8UOluzGH6Niqze88UUcphkGiZAZTpxZTWv4vK2nSd0CG4D X-Received: by 2002:a05:6a20:3d84:b0:14c:d5e9:14d5 with SMTP id s4-20020a056a203d8400b0014cd5e914d5mr2090502pzi.14.1694786511167; Fri, 15 Sep 2023 07:01:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694786511; cv=none; d=google.com; s=arc-20160816; b=JAGNAq4rrO1bdVP4J6XTx8CHLWNc0nAWxZj2lmSnYiJKXE6Igy8eTXmL/JMjRuHl2T +ILr9RYb224JghMl4W1QXn8j9kTTzj1/P63IHU6Bs/ywFDrlBApbyoMcMvCFRMY6o8tN 4jgrAFYfgqU/XYgpaogshAAynPDlR9iS1FnQJgT/kbISt9xHAWTjSPnCdPpZdgQd51nn eAysS9bKMXdDdpgE/x4lyZaediU2MYEKFqP1Pc7jsVq7D1jau5PpJq0eSI7Qow49Tc9A ZevrFg0wq0shKsxnHT7hHTcNAGjotKuJf1amxCCcH+dOlSpThY62+5ZdtYMUtuNB93v6 /BUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=tG76X2i5DB/SROipWcWTkvhga5GJZ6cKkuw+MFh6Aqo=; fh=mh/EFXDyWz6SYA4qEbcbMgOZ07AT4DlRJonTEXgTb50=; b=rI2b/ETzL99kgtCnfLYi1Fz9WfZp83fI+jnb97gvWyHloKMi43VZAfxnhOjW8HHT7w bsP2ncSsJz7+a3hPOoL7FWg7NiD3TxMXNMRHOa3unBzrIVXlsNJSN9WiFrem3oOLkERn hzV2jfenxm0TdgyBIRmIueXUk1viu/ybnGBaa/esqSUJDr7G82x7eG4RqEBo+UoIsbUY noS1O/yOhAmJ48d8SvfXZrDw3a+/dYg3WUevMMs5R4eLsoqj/awa4UXFhjWIiSNOq4ev fpxliny2CwRvNW+WmK4rzSBaF7vVBJpAq+UZhnGs3UjhmzcEiE4SYk4bA5k6Luj2vUmw GY6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=Rqgo+MDG; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id n40-20020a056a000d6800b0068fe23ffe60si3277740pfv.250.2023.09.15.07.01.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 07:01:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=Rqgo+MDG; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id A430680ACFE3; Fri, 15 Sep 2023 02:38:24 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233773AbjIOJiP (ORCPT + 32 others); Fri, 15 Sep 2023 05:38:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38244 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233707AbjIOJiN (ORCPT ); Fri, 15 Sep 2023 05:38:13 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8DCD12119; Fri, 15 Sep 2023 02:37:48 -0700 (PDT) Date: Fri, 15 Sep 2023 09:37:46 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1694770667; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tG76X2i5DB/SROipWcWTkvhga5GJZ6cKkuw+MFh6Aqo=; b=Rqgo+MDGa6i2Apua5VasLJW7xD4IUj78vzKY0FcOGPCHEln5M1LRmBPHBEUmBuuFAc/XbP NvIteanqBStDv427N916Xa4QJwQD0m0HKwfph0aO76NOZMqVIyMmUULY3jsDbbCLsv4Gzu i9j1zLnv58BCPAuB9INF7aKUJqg3s/L/L1NWgu1nxvQh2YosU0+az4sonWlS1qHtMI5RVr 24kfzIr3gZceCqmuFDibFPFNRTB54mLOanjFmTN3HHtA/1lZcZHbnWBrpn98NGG0eNhjJ6 QkeWMZKv+CitAxnxcYHLw53ZftdEXaNhZRo8JOjZijVlMFHIp5o/xwmmECH3nQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1694770667; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tG76X2i5DB/SROipWcWTkvhga5GJZ6cKkuw+MFh6Aqo=; b=AqAwXnqBDfw00r1zj7Dfx9tCS9YTGOGuBATbwUUpJ6XTYGeymBZmlNBA8IvvE3BTFMmlC3 Aaf3H7j13BIUNICw== From: "tip-bot2 for Ard Biesheuvel" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/boot] x86/boot: Drop references to startup_64 Cc: Ard Biesheuvel , Ingo Molnar , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230912090051.4014114-25-ardb@google.com> References: <20230912090051.4014114-25-ardb@google.com> MIME-Version: 1.0 Message-ID: <169477066668.27769.18211226993970606618.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Fri, 15 Sep 2023 02:38:24 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776906045958064812 X-GMAIL-MSGID: 1777112460628972853 The following commit has been merged into the x86/boot branch of tip: Commit-ID: b618d31f112bea3d2daea19190d63e567f32a4db Gitweb: https://git.kernel.org/tip/b618d31f112bea3d2daea19190d63e567f32a4db Author: Ard Biesheuvel AuthorDate: Tue, 12 Sep 2023 09:00:59 Committer: Ingo Molnar CommitterDate: Fri, 15 Sep 2023 11:18:42 +02:00 x86/boot: Drop references to startup_64 The x86 boot image generation tool assign a default value to startup_64 and subsequently parses the actual value from zoffset.h but it never actually uses the value anywhere. So remove this code. This change has no impact on the resulting bzImage binary. Signed-off-by: Ard Biesheuvel Signed-off-by: Ingo Molnar Link: https://lore.kernel.org/r/20230912090051.4014114-25-ardb@google.com --- arch/x86/boot/Makefile | 2 +- arch/x86/boot/tools/build.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile index f33e45e..0e98bc5 100644 --- a/arch/x86/boot/Makefile +++ b/arch/x86/boot/Makefile @@ -89,7 +89,7 @@ $(obj)/vmlinux.bin: $(obj)/compressed/vmlinux FORCE SETUP_OBJS = $(addprefix $(obj)/,$(setup-y)) -sed-zoffset := -e 's/^\([0-9a-fA-F]*\) [a-zA-Z] \(startup_32\|startup_64\|efi32_stub_entry\|efi64_stub_entry\|efi_pe_entry\|efi32_pe_entry\|input_data\|kernel_info\|_end\|_ehead\|_text\|z_.*\)$$/\#define ZO_\2 0x\1/p' +sed-zoffset := -e 's/^\([0-9a-fA-F]*\) [a-zA-Z] \(startup_32\|efi32_stub_entry\|efi64_stub_entry\|efi_pe_entry\|efi32_pe_entry\|input_data\|kernel_info\|_end\|_ehead\|_text\|z_.*\)$$/\#define ZO_\2 0x\1/p' quiet_cmd_zoffset = ZOFFSET $@ cmd_zoffset = $(NM) $< | sed -n $(sed-zoffset) > $@ diff --git a/arch/x86/boot/tools/build.c b/arch/x86/boot/tools/build.c index efa4e9c..10b0207 100644 --- a/arch/x86/boot/tools/build.c +++ b/arch/x86/boot/tools/build.c @@ -60,7 +60,6 @@ static unsigned long efi64_stub_entry; static unsigned long efi_pe_entry; static unsigned long efi32_pe_entry; static unsigned long kernel_info; -static unsigned long startup_64; static unsigned long _end; /*----------------------------------------------------------------------*/ @@ -264,7 +263,6 @@ static void efi_stub_defaults(void) efi_pe_entry = 0x10; #else efi_pe_entry = 0x210; - startup_64 = 0x200; #endif } @@ -340,7 +338,6 @@ static void parse_zoffset(char *fname) PARSE_ZOFS(p, efi_pe_entry); PARSE_ZOFS(p, efi32_pe_entry); PARSE_ZOFS(p, kernel_info); - PARSE_ZOFS(p, startup_64); PARSE_ZOFS(p, _end); p = strchr(p, '\n');