From patchwork Fri Dec 2 13:14:43 2022 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: 28910 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp851304wrr; Fri, 2 Dec 2022 05:26:19 -0800 (PST) X-Google-Smtp-Source: AA0mqf50RZgTzuf4RYEbEkVHW3GzBvMJh/HFSU2F2o3B1E6/wanMQUngCLsH/EziD2OODY+2Ul5A X-Received: by 2002:a17:90a:8417:b0:210:9e08:d577 with SMTP id j23-20020a17090a841700b002109e08d577mr83452822pjn.134.1669987578672; Fri, 02 Dec 2022 05:26:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669987578; cv=none; d=google.com; s=arc-20160816; b=HgDVjTwa7ssJBezUKvLxPrF0x8F34Ms/+rvVyV6GLyhFpSNFamADqGeGuGmzQIyD4/ F8cGgWyKQq53uEApRVZYAZ3mWV92LC0KlhbUVZWPrOYcVVBMP993FjhFql2T26B0zkol Obz7ZJZWILHmB6Are5MDUC5IApIjDBYGtovZGXH4qpX7AoU1ZY9+M9mX3g2TDzwEh+3o QuAJAKDi7Py6uUhTvtO5kUwn8rULy4+iVWhVocLegox2qvjAgOwomebjPoRbMLM/fSey 9epjw6LxkHnR96rdche10zVg2x0O4clgKLYVgER3Zr/8B/OUhqvs02qOqtT3CHD75PCi /MnQ== 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=h+p2fu6JSCcHY0+/+EgBDL3llyV9MW691Es3BXXbOoA=; b=CXabrSM960jbKmPbdNhLZuabDxQTKBD27+Is8eHjMsKP/pncZYjkDqqxCDC/QtzkX2 suIa28XMcRJhk819ZQeEkfuFxrTURMMAILMS65MWySaNxYfrvkujUtX4JbgTwLJNZ+gi +vi/x6bJw40aoTBCmyJTDl9ddvaHBcWoN8vD3WlWe/FclYq703KsEbuyhzcHkLVfU8Cr JLlJOaJyRhRh75sQqnzItv6wfcLMBH+9TWsE/aicByj3fIeBRtPWPAQnM3tRMFj8dxAK hNCvSeQH9pQoexBCcU50VTXGPVWjc1q76OsOBwQAZs6TYnlQBzLftistdU+1vPf5hYdl Nvrw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=V5rT8kbl; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l14-20020a170902f68e00b0017c162fc28fsi8221378plg.195.2022.12.02.05.26.03; Fri, 02 Dec 2022 05:26:18 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=V5rT8kbl; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232941AbiLBNOt (ORCPT + 99 others); Fri, 2 Dec 2022 08:14:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45978 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232011AbiLBNOs (ORCPT ); Fri, 2 Dec 2022 08:14:48 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A2A4CC2D34; Fri, 2 Dec 2022 05:14:46 -0800 (PST) Date: Fri, 02 Dec 2022 13:14:43 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1669986885; 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=h+p2fu6JSCcHY0+/+EgBDL3llyV9MW691Es3BXXbOoA=; b=V5rT8kblTn0wGD71Q6TbK7hSlbNG/8Mo3Be3SGLDQmD3haAkUZhav1D52Z6SIqSN05VRfY 46bpuGHep3wfZdQiFIoShYtBQqPAQpBQnZF0e911wVBjkoh0MdB5C/sw16HYwJSultteUM HMztnTn1hMDeJHo76w7V6iA4xUeFeq8FBo6V7F4WQ13KJD+rCy361Zy0CNHxHd6jyCh0cX WSgsQL3t6SlHBlMbsmiqp0UJc4eS8OLNFBm7Hu/eLMWV20fper2ZiuClCbEpwYgvLJLcmT waxFl1oFhRDTD3k038a9imMPPb/GCztgUkNYkuoeTbyhZ0G2kRnpSO52gvvckA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1669986885; 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=h+p2fu6JSCcHY0+/+EgBDL3llyV9MW691Es3BXXbOoA=; b=slJ/mJ+I3cZUWlsJOiQhQgNXk9NEzXEABOwkoFv68OKnxRrTPv6HlD5vTY7jBx/KHbcF6g Dzzv79lGg5gS8lAA== From: "tip-bot2 for Brian Gerst" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/cleanups] x86/asm/32: Remove setup_once() Cc: Brian Gerst , Thomas Gleixner , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20221115184328.70874-1-brgerst@gmail.com> References: <20221115184328.70874-1-brgerst@gmail.com> MIME-Version: 1.0 Message-ID: <166998688334.4906.16854290928005814272.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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1751108895343078641?= X-GMAIL-MSGID: =?utf-8?q?1751108895343078641?= The following commit has been merged into the x86/cleanups branch of tip: Commit-ID: ff4c85c05333c6f24d3fe0a344c6dacd18a7ee49 Gitweb: https://git.kernel.org/tip/ff4c85c05333c6f24d3fe0a344c6dacd18a7ee49 Author: Brian Gerst AuthorDate: Tue, 15 Nov 2022 13:43:28 -05:00 Committer: Thomas Gleixner CommitterDate: Fri, 02 Dec 2022 14:06:34 +01:00 x86/asm/32: Remove setup_once() After the removal of the stack canary segment setup code, this function does nothing. Signed-off-by: Brian Gerst Signed-off-by: Thomas Gleixner Link: https://lore.kernel.org/r/20221115184328.70874-1-brgerst@gmail.com --- arch/x86/kernel/head_32.S | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S index 9b7acc9..67c8ed9 100644 --- a/arch/x86/kernel/head_32.S +++ b/arch/x86/kernel/head_32.S @@ -261,16 +261,6 @@ SYM_FUNC_START(startup_32_smp) addl $__PAGE_OFFSET, %esp /* - * start system 32-bit setup. We need to re-do some of the things done - * in 16-bit mode for the "real" operations. - */ - movl setup_once_ref,%eax - andl %eax,%eax - jz 1f # Did we do this already? - call *%eax -1: - -/* * Check if it is 486 */ movb $4,X86 # at least 486 @@ -331,18 +321,7 @@ SYM_FUNC_END(startup_32_smp) #include "verify_cpu.S" -/* - * setup_once - * - * The setup work we only want to run on the BSP. - * - * Warning: %esi is live across this function. - */ __INIT -setup_once: - andl $0,setup_once_ref /* Once is enough, thanks */ - RET - SYM_FUNC_START(early_idt_handler_array) # 36(%esp) %eflags # 32(%esp) %cs @@ -458,7 +437,6 @@ SYM_DATA(early_recursion_flag, .long 0) __REFDATA .align 4 SYM_DATA(initial_code, .long i386_start_kernel) -SYM_DATA(setup_once_ref, .long setup_once) #ifdef CONFIG_PAGE_TABLE_ISOLATION #define PGD_ALIGN (2 * PAGE_SIZE)