From patchwork Fri Jun 16 09:24:48 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: 109000 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1203593vqr; Fri, 16 Jun 2023 02:43:35 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6jUFFOm56NtVmTcgaCr/TVqJq7rSdFAsYYGnxlu180kjeYJlc6k7TS29V6VM0pXR57O3Vq X-Received: by 2002:a17:90a:8a11:b0:25b:dc2a:c676 with SMTP id w17-20020a17090a8a1100b0025bdc2ac676mr959890pjn.44.1686908614771; Fri, 16 Jun 2023 02:43:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686908614; cv=none; d=google.com; s=arc-20160816; b=oKysMPb/tC3SwecByHd7H+GokIkC+BlPWTJ2PODSSgIl3isHeDzkniaUlORuActDbC gv4IsQZb7i1S0WY9hcX5sqy+EsWM4vo58Ke94ezAG7fUixWCpcv6lOfM2rgPeFnrokxO mRHXAI/zYBYr99iaXohdt2KYkuT4xwyWFDtgieexggPUTFv85gs7yzfLbtVB8uQDdvl2 UNZl0CPtTv88zB60qdsQhRz++wjVMbrkqA08V61/F2CHLTlIPv6HqIg6dQFTkKNjyJUO 5aE2Oek77O+AiCigAsirWoZOw7+dgsNj9AzNyLNBAPfi0RjZx5GRu4s6naIKLCdkxFo0 AguA== 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=7CRZ/I+UHhDqzwb3VMqBS3zXkZGutnO/KuKUuPRDd4w=; b=guISDcCsLiImm+odcuvQeR0SqUfCgQebOVJyHofNYwXWfCi1R7IaS7CKnjNWU0R2NA i3qzj3D5ND2p4RBAL7X9t5npjBmE55qYiDuEu5l1G1w4yYl/HtjMptPG46hjBJ93IeeR Z+oVBEKcLRpM3sxjEAKyrNO3RU636Jm/Qj5gqZINUs4ZrZz9XhIde6yTYyaBOXar734o 0HJniteKMN6BnzFigWicOghP0lPZw3BOnyDXdU9IXTx7meSKsAxCsytaeREpo2JSoNF8 d6gDWrc7JHbtkEWE8NPBDMMQHUmhEVD+eXrhuMIYaER37FOXoHzz9Sq0spB1/EI/XuIJ CgBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=iiRuaZqg; 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 s1-20020a17090a074100b00259609d53cesi1178017pje.68.2023.06.16.02.43.20; Fri, 16 Jun 2023 02:43:34 -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=iiRuaZqg; 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 S1344133AbjFPJ0P (ORCPT + 99 others); Fri, 16 Jun 2023 05:26:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41400 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344134AbjFPJYz (ORCPT ); Fri, 16 Jun 2023 05:24:55 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1B775EA; Fri, 16 Jun 2023 02:24:52 -0700 (PDT) Date: Fri, 16 Jun 2023 09:24:48 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1686907488; 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=7CRZ/I+UHhDqzwb3VMqBS3zXkZGutnO/KuKUuPRDd4w=; b=iiRuaZqg+ML8Y7P/U4IvPnWsPvt360b1m4qJFPRXIHUgtSZI311SDLKRN9z/snR5Vs6YRx ODimoHNTpntc6LXvwIooI02dtPgSfhyYMLmSUa0GrRzl7qkNn32giLW1j1An7hjm8g1eCk WEKSwzM3epB2vckajyFbSTxykloq9eUHXjeMMMyqy726iTeG5OrHpWaIpVctQPpwDqqbZt bQwddA3VxXV0tPotH2RuZ2mSOAFocyaKixA41DJVjgWyZIsZk7AmTITm2neOY3E/Yp3X1n 3ZpN/co2UavIGMC7iJf6EkKYg+Jd3F+2ogsa+OHk0jsJ2eyGDLfhC1xpyp/igw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1686907488; 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=7CRZ/I+UHhDqzwb3VMqBS3zXkZGutnO/KuKUuPRDd4w=; b=3CIbApYBXKikxfE00QRM4Djn93HFAAzVRCmFv2xTNrWupP7Opn+bCmFHzSUGisOY1rnwdw 6CZ0/7rGs17BK/Dw== 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] m68k/cpu: Switch to arch_cpu_finalize_init() Cc: Thomas Gleixner , Geert Uytterhoeven , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230613224545.254342916@linutronix.de> References: <20230613224545.254342916@linutronix.de> MIME-Version: 1.0 Message-ID: <168690748843.404.10599176474859670498.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?1768633248395382923?= X-GMAIL-MSGID: =?utf-8?q?1768851887617181407?= The following commit has been merged into the x86/boot branch of tip: Commit-ID: 9ceecc2589b9d7cef6b321339ed8de484eac4b20 Gitweb: https://git.kernel.org/tip/9ceecc2589b9d7cef6b321339ed8de484eac4b20 Author: Thomas Gleixner AuthorDate: Wed, 14 Jun 2023 01:39:30 +02:00 Committer: Thomas Gleixner CommitterDate: Fri, 16 Jun 2023 10:15:59 +02:00 m68k/cpu: Switch to arch_cpu_finalize_init() check_bugs() is about to be phased out. Switch over to the new arch_cpu_finalize_init() implementation. No functional change. Signed-off-by: Thomas Gleixner Acked-by: Geert Uytterhoeven Link: https://lore.kernel.org/r/20230613224545.254342916@linutronix.de --- arch/m68k/Kconfig | 1 + arch/m68k/include/asm/bugs.h | 21 --------------------- arch/m68k/kernel/setup_mm.c | 3 ++- 3 files changed, 3 insertions(+), 22 deletions(-) delete mode 100644 arch/m68k/include/asm/bugs.h diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig index 40198a1..dc792b3 100644 --- a/arch/m68k/Kconfig +++ b/arch/m68k/Kconfig @@ -4,6 +4,7 @@ config M68K default y select ARCH_32BIT_OFF_T select ARCH_HAS_BINFMT_FLAT + select ARCH_HAS_CPU_FINALIZE_INIT if MMU select ARCH_HAS_CURRENT_STACK_POINTER select ARCH_HAS_DMA_PREP_COHERENT if HAS_DMA && MMU && !COLDFIRE select ARCH_HAS_SYNC_DMA_FOR_DEVICE if HAS_DMA diff --git a/arch/m68k/include/asm/bugs.h b/arch/m68k/include/asm/bugs.h deleted file mode 100644 index 7455306..0000000 --- a/arch/m68k/include/asm/bugs.h +++ /dev/null @@ -1,21 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* - * include/asm-m68k/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); - */ - -#ifdef CONFIG_MMU -extern void check_bugs(void); /* in arch/m68k/kernel/setup.c */ -#else -static void check_bugs(void) -{ -} -#endif diff --git a/arch/m68k/kernel/setup_mm.c b/arch/m68k/kernel/setup_mm.c index fbff1ce..6f1ae01 100644 --- a/arch/m68k/kernel/setup_mm.c +++ b/arch/m68k/kernel/setup_mm.c @@ -10,6 +10,7 @@ */ #include +#include #include #include #include @@ -504,7 +505,7 @@ static int __init proc_hardware_init(void) module_init(proc_hardware_init); #endif -void check_bugs(void) +void __init arch_cpu_finalize_init(void) { #if defined(CONFIG_FPU) && !defined(CONFIG_M68KFPU_EMU) if (m68k_fputype == 0) {