diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.9.21/0037-x86-kaiser-Move-feature-detection-up.patch')
-rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.9.21/0037-x86-kaiser-Move-feature-detection-up.patch | 85 |
1 files changed, 0 insertions, 85 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.9.21/0037-x86-kaiser-Move-feature-detection-up.patch b/common/recipes-kernel/linux/linux-yocto-4.9.21/0037-x86-kaiser-Move-feature-detection-up.patch deleted file mode 100644 index 77e19632..00000000 --- a/common/recipes-kernel/linux/linux-yocto-4.9.21/0037-x86-kaiser-Move-feature-detection-up.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 4ce3d405a42c5799b762102a5f136159d5d7b5f8 Mon Sep 17 00:00:00 2001 -From: Borislav Petkov <bp@suse.de> -Date: Mon, 25 Dec 2017 13:57:16 +0100 -Subject: [PATCH 037/103] x86/kaiser: Move feature detection up - -... before the first use of kaiser_enabled as otherwise funky -things happen: - - about to get started... - (XEN) d0v0 Unhandled page fault fault/trap [#14, ec=0000] - (XEN) Pagetable walk from ffff88022a449090: - (XEN) L4[0x110] = 0000000229e0e067 0000000000001e0e - (XEN) L3[0x008] = 0000000000000000 ffffffffffffffff - (XEN) domain_crash_sync called from entry.S: fault at ffff82d08033fd08 - entry.o#create_bounce_frame+0x135/0x14d - (XEN) Domain 0 (vcpu#0) crashed on cpu#0: - (XEN) ----[ Xen-4.9.1_02-3.21 x86_64 debug=n Not tainted ]---- - (XEN) CPU: 0 - (XEN) RIP: e033:[<ffffffff81007460>] - (XEN) RFLAGS: 0000000000000286 EM: 1 CONTEXT: pv guest (d0v0) - -Signed-off-by: Borislav Petkov <bp@suse.de> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - arch/x86/include/asm/kaiser.h | 2 ++ - arch/x86/kernel/setup.c | 7 +++++++ - arch/x86/mm/kaiser.c | 2 -- - 3 files changed, 9 insertions(+), 2 deletions(-) - -diff --git a/arch/x86/include/asm/kaiser.h b/arch/x86/include/asm/kaiser.h -index 906150d..b5e46aa 100644 ---- a/arch/x86/include/asm/kaiser.h -+++ b/arch/x86/include/asm/kaiser.h -@@ -96,8 +96,10 @@ DECLARE_PER_CPU(unsigned long, x86_cr3_pcid_user); - extern char __per_cpu_user_mapped_start[], __per_cpu_user_mapped_end[]; - - extern int kaiser_enabled; -+extern void __init kaiser_check_boottime_disable(void); - #else - #define kaiser_enabled 0 -+static inline void __init kaiser_check_boottime_disable(void) {} - #endif /* CONFIG_KAISER */ - - /* -diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c -index 9c337b0..545a95a 100644 ---- a/arch/x86/kernel/setup.c -+++ b/arch/x86/kernel/setup.c -@@ -114,6 +114,7 @@ - #include <asm/microcode.h> - #include <asm/mmu_context.h> - #include <asm/kaslr.h> -+#include <asm/kaiser.h> - - /* - * max_low_pfn_mapped: highest direct mapped pfn under 4GB -@@ -1019,6 +1020,12 @@ void __init setup_arch(char **cmdline_p) - */ - init_hypervisor_platform(); - -+ /* -+ * This needs to happen right after XENPV is set on xen and -+ * kaiser_enabled is checked below in cleanup_highmap(). -+ */ -+ kaiser_check_boottime_disable(); -+ - x86_init.resources.probe_roms(); - - /* after parse_early_param, so could debug it */ -diff --git a/arch/x86/mm/kaiser.c b/arch/x86/mm/kaiser.c -index 2768854..d43f369 100644 ---- a/arch/x86/mm/kaiser.c -+++ b/arch/x86/mm/kaiser.c -@@ -310,8 +310,6 @@ void __init kaiser_init(void) - { - int cpu; - -- kaiser_check_boottime_disable(); -- - if (!kaiser_enabled) - return; - --- -2.7.4 - |