From patchwork Fri Jun 16 09:24:45 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: 108979 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1197600vqr; Fri, 16 Jun 2023 02:31:02 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5yYAZky7n94EteglqWH7FEhUGt1FmBGgUkpDMncGCK3KMYVpAjB93KK/tEZb2X6EvUbHza X-Received: by 2002:a05:6358:705e:b0:12b:e146:214 with SMTP id 30-20020a056358705e00b0012be1460214mr991316rwp.18.1686907862234; Fri, 16 Jun 2023 02:31:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686907862; cv=none; d=google.com; s=arc-20160816; b=Oz0oDziVtDKPQ8GMKLKtE9r1kVd6Y9dC0SQ9yDfaRiTkrWHp7cTzS+iJ0ku4nn2aTz ZHg9owflQGxprj/BKFhR1kKws29V7gO7Us5uZhmTGd772in3RjBMyhMNOiL3jm8HTvYg Yimu80QkQXPjDtCbDmvxWn0pfIyUOk1fs0Uu0LBIxjXiB7xZBzu7BEdvM05nje04Y2dQ +3vw6gS9NWw0pwtDVoWYgY+TBHZP4L1JikIsQVvxThgezmnB1o3xWcy/Fu90ZU30khi6 NJSMhCooKoo1nY5RdOF8wqeczT5b0JZ8m4gdfu4OKbuWgv7gMJ0oeolwFck5HEML/z19 CyDQ== 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=YZTWS/SmuIy5BfPauwJpZ7bZrTkvmO1D/YACfu7OakQ=; b=emvgpZ4smreAyCxWJFtw5E/MGeu2OnR7YrotjcV5HdX729md37e3SvkQeDUy5qOGE4 /hSQTzVkYlQLiipJbfmwfpqKQVcKN4/Zxq50gjQxAld3FwE237mA9l/p/O1J1BSNhezu jH0Kv0LNLqhEfCfhtHFXx/ai24YEDeIj2yLC8nYmp1blV25u+y7Hjg+1E2aJg2pMQTL7 Yg97OS78zMx91fRfPfrBlk7riuDeEnr8U+Mo0VG2N381zH9cZtfnjRNoTV1MENyn7uSu Y2EfWvBIVO1nr1nqNA1UHMFgTLnzp6qFDALR/kgYF/bHT4SNYsRnP+QT9kA0MtZDAecE i+jQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=SxulI0rg; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=ng9chCFj; 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 z16-20020a63b910000000b00542b1792242si11165717pge.720.2023.06.16.02.30.46; Fri, 16 Jun 2023 02:31:02 -0700 (PDT) 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=SxulI0rg; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=ng9chCFj; 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 S233647AbjFPJZm (ORCPT + 99 others); Fri, 16 Jun 2023 05:25:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41380 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344095AbjFPJYx (ORCPT ); Fri, 16 Jun 2023 05:24:53 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9BD2626AF; Fri, 16 Jun 2023 02:24:50 -0700 (PDT) Date: Fri, 16 Jun 2023 09:24:45 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1686907485; 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=YZTWS/SmuIy5BfPauwJpZ7bZrTkvmO1D/YACfu7OakQ=; b=SxulI0rgwigPjRLa7nAPVIh1QuFoK0TvA7ycEVUcVRypRFJ40Gg88QhLVOGoifJjP/RoNG LW/EHwjnBN1L0nzGM3gJMQ00cWxpt8NZ038k7jGqh6mUUflGDIaN5oXd/d4OqSg29tgBtx Y7epxMmaWHJS25/jwLr4iCPBJgFYEBvTX64oSGi8SZs5SH4eLwlh5/blECAPkx71ORnvO4 apc6Ch1PxenELWvBqGOJAPTVGMmqH4KOzyL6o7BG3KVTkzge2buClMEA9wTKQE6r5EYQIB OKgBuxCWcAJItbKqFjh2vFBIFL5h0lJ0T2WdOBqbmZXSp40DRhc3z9MyhiycmA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1686907485; 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=YZTWS/SmuIy5BfPauwJpZ7bZrTkvmO1D/YACfu7OakQ=; b=ng9chCFjclTqUn0+iuDeLO4cP/nycSjn8GZHXEgy0cHIDXGsE2YBfU8EmlEi4uo7IpHBB3 nq+6iBJUMsUHeBCw== From: "tip-bot2 for Thomas Gleixner" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/boot] init: Remove check_bugs() leftovers Cc: Thomas Gleixner , Richard Henderson , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230613224545.553215951@linutronix.de> References: <20230613224545.553215951@linutronix.de> MIME-Version: 1.0 Message-ID: <168690748517.404.6670831625304458737.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,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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?1768633245250664039?= X-GMAIL-MSGID: =?utf-8?q?1768851098465044763?= The following commit has been merged into the x86/boot branch of tip: Commit-ID: 61235b24b9cb37c13fcad5b9596d59a1afdcec30 Gitweb: https://git.kernel.org/tip/61235b24b9cb37c13fcad5b9596d59a1afdcec30 Author: Thomas Gleixner AuthorDate: Wed, 14 Jun 2023 01:39:38 +02:00 Committer: Thomas Gleixner CommitterDate: Fri, 16 Jun 2023 10:16:00 +02:00 init: Remove check_bugs() leftovers Everything is converted over to arch_cpu_finalize_init(). Remove the check_bugs() leftovers including the empty stubs in asm-generic, alpha, parisc, powerpc and xtensa. Signed-off-by: Thomas Gleixner Reviewed-by: Richard Henderson Link: https://lore.kernel.org/r/20230613224545.553215951@linutronix.de --- arch/alpha/include/asm/bugs.h | 20 -------------------- arch/parisc/include/asm/bugs.h | 20 -------------------- arch/powerpc/include/asm/bugs.h | 15 --------------- arch/xtensa/include/asm/bugs.h | 18 ------------------ include/asm-generic/bugs.h | 11 ----------- init/main.c | 5 ----- 6 files changed, 89 deletions(-) delete mode 100644 arch/alpha/include/asm/bugs.h delete mode 100644 arch/parisc/include/asm/bugs.h delete mode 100644 arch/powerpc/include/asm/bugs.h delete mode 100644 arch/xtensa/include/asm/bugs.h delete mode 100644 include/asm-generic/bugs.h diff --git a/arch/alpha/include/asm/bugs.h b/arch/alpha/include/asm/bugs.h deleted file mode 100644 index 78030d1..0000000 --- a/arch/alpha/include/asm/bugs.h +++ /dev/null @@ -1,20 +0,0 @@ -/* - * include/asm-alpha/bugs.h - * - * Copyright (C) 1994 Linus Torvalds - */ - -/* - * This is included by init/main.c to check for architecture-dependent bugs. - * - * Needs: - * void check_bugs(void); - */ - -/* - * I don't know of any alpha bugs yet.. Nice chip - */ - -static void check_bugs(void) -{ -} diff --git a/arch/parisc/include/asm/bugs.h b/arch/parisc/include/asm/bugs.h deleted file mode 100644 index 0a7f9db..0000000 --- a/arch/parisc/include/asm/bugs.h +++ /dev/null @@ -1,20 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* - * include/asm-parisc/bugs.h - * - * Copyright (C) 1999 Mike Shaver - */ - -/* - * This is included by init/main.c to check for architecture-dependent bugs. - * - * Needs: - * void check_bugs(void); - */ - -#include - -static inline void check_bugs(void) -{ -// identify_cpu(&boot_cpu_data); -} diff --git a/arch/powerpc/include/asm/bugs.h b/arch/powerpc/include/asm/bugs.h deleted file mode 100644 index 01b8f6c..0000000 --- a/arch/powerpc/include/asm/bugs.h +++ /dev/null @@ -1,15 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ -#ifndef _ASM_POWERPC_BUGS_H -#define _ASM_POWERPC_BUGS_H - -/* - */ - -/* - * This file is included by 'init/main.c' to check for - * architecture-dependent bugs. - */ - -static inline void check_bugs(void) { } - -#endif /* _ASM_POWERPC_BUGS_H */ diff --git a/arch/xtensa/include/asm/bugs.h b/arch/xtensa/include/asm/bugs.h deleted file mode 100644 index 69b29d1..0000000 --- a/arch/xtensa/include/asm/bugs.h +++ /dev/null @@ -1,18 +0,0 @@ -/* - * include/asm-xtensa/bugs.h - * - * This is included by init/main.c to check for architecture-dependent bugs. - * - * Xtensa processors don't have any bugs. :) - * - * This file is subject to the terms and conditions of the GNU General - * Public License. See the file "COPYING" in the main directory of - * this archive for more details. - */ - -#ifndef _XTENSA_BUGS_H -#define _XTENSA_BUGS_H - -static void check_bugs(void) { } - -#endif /* _XTENSA_BUGS_H */ diff --git a/include/asm-generic/bugs.h b/include/asm-generic/bugs.h deleted file mode 100644 index 6902183..0000000 --- a/include/asm-generic/bugs.h +++ /dev/null @@ -1,11 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef __ASM_GENERIC_BUGS_H -#define __ASM_GENERIC_BUGS_H -/* - * This file is included by 'init/main.c' to check for - * architecture-dependent bugs. - */ - -static inline void check_bugs(void) { } - -#endif /* __ASM_GENERIC_BUGS_H */ diff --git a/init/main.c b/init/main.c index 77d5316..389ac62 100644 --- a/init/main.c +++ b/init/main.c @@ -103,7 +103,6 @@ #include #include -#include #include #include #include @@ -1079,10 +1078,6 @@ asmlinkage __visible void __init __no_sanitize_address __noreturn start_kernel(v delayacct_init(); arch_cpu_finalize_init(); - /* Temporary conditional until everything has been converted */ -#ifndef CONFIG_ARCH_HAS_CPU_FINALIZE_INIT - check_bugs(); -#endif acpi_subsystem_init(); arch_post_acpi_subsys_init();