9dd7462461
by cherry-picking the relevant commits from launchpad/lunar [0]. (relevant commits are based on k.o/stable commits for this) minimally tested by booting my (ryzen) machine with this kernel and skimming through dmesg after boot. [0] git://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux/+git/lunar Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
81 lines
2.5 KiB
Diff
81 lines
2.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Gleixner <tglx@linutronix.de>
|
|
Date: Wed, 14 Jun 2023 01:39:27 +0200
|
|
Subject: [PATCH] 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@linutronix.de>
|
|
Link: https://lore.kernel.org/r/20230613224545.137045745@linutronix.de
|
|
|
|
(cherry picked from commit 6c38e3005621800263f117fb00d6787a76e16de7)
|
|
CVE-2022-40982
|
|
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
|
|
Acked-by: Roxana Nicolescu <roxana.nicolescu@canonical.com>
|
|
Acked-by: Stefan Bader <stefan.bader@canonical.com>
|
|
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
|
|
(cherry picked from commit 7b593af98529e22ee2b54dda992a205bd8935a97)
|
|
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
|
|
---
|
|
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 d7e4a24e8644..25ebc90b3ec3 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 0d6b9bded56c..000000000000
|
|
--- 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@hpl.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 c05728044272..9009f1871e3b 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);
|