[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <168690748968.404.14167135207073680726.tip-bot2@tip-bot2>
Date: Fri, 16 Jun 2023 09:24:49 -0000
From: "tip-bot2 for Thomas Gleixner" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Thomas Gleixner <tglx@...utronix.de>, x86@...nel.org,
linux-kernel@...r.kernel.org
Subject: [tip: x86/boot] ia64/cpu: Switch to arch_cpu_finalize_init()
The following commit has been merged into the x86/boot branch of tip:
Commit-ID: 6c38e3005621800263f117fb00d6787a76e16de7
Gitweb: https://git.kernel.org/tip/6c38e3005621800263f117fb00d6787a76e16de7
Author: Thomas Gleixner <tglx@...utronix.de>
AuthorDate: Wed, 14 Jun 2023 01:39:27 +02:00
Committer: Thomas Gleixner <tglx@...utronix.de>
CommitterDate: Fri, 16 Jun 2023 10:15:59 +02:00
ia64/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 <tglx@...utronix.de>
Link: https://lore.kernel.org/r/20230613224545.137045745@linutronix.de
---
arch/ia64/Kconfig | 1 +
arch/ia64/include/asm/bugs.h | 20 --------------------
arch/ia64/kernel/setup.c | 3 +--
3 files changed, 2 insertions(+), 22 deletions(-)
delete mode 100644 arch/ia64/include/asm/bugs.h
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 21fa63c..2cd93e6 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -9,6 +9,7 @@ menu "Processor type and features"
config IA64
bool
select ARCH_BINFMT_ELF_EXTRA_PHDRS
+ select ARCH_HAS_CPU_FINALIZE_INIT
select ARCH_HAS_DMA_MARK_CLEAN
select ARCH_HAS_STRNCPY_FROM_USER
select ARCH_HAS_STRNLEN_USER
diff --git a/arch/ia64/include/asm/bugs.h b/arch/ia64/include/asm/bugs.h
deleted file mode 100644
index 0d6b9bd..0000000
--- a/arch/ia64/include/asm/bugs.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * This is included by init/main.c to check for architecture-dependent bugs.
- *
- * Needs:
- * void check_bugs(void);
- *
- * Based on <asm-alpha/bugs.h>.
- *
- * Modified 1998, 1999, 2003
- * David Mosberger-Tang <davidm@....hp.com>, Hewlett-Packard Co.
- */
-#ifndef _ASM_IA64_BUGS_H
-#define _ASM_IA64_BUGS_H
-
-#include <asm/processor.h>
-
-extern void check_bugs (void);
-
-#endif /* _ASM_IA64_BUGS_H */
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index c057280..9009f18 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -1067,8 +1067,7 @@ cpu_init (void)
}
}
-void __init
-check_bugs (void)
+void __init arch_cpu_finalize_init(void)
{
ia64_patch_mckinley_e9((unsigned long) __start___mckinley_e9_bundles,
(unsigned long) __end___mckinley_e9_bundles);
Powered by blists - more mailing lists