diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.9.21/0053-x86-cpu-Merge-bugs.c-and-bugs_64.c.patch')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.9.21/0053-x86-cpu-Merge-bugs.c-and-bugs_64.c.patch | 141 |
1 files changed, 0 insertions, 141 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.9.21/0053-x86-cpu-Merge-bugs.c-and-bugs_64.c.patch b/common/recipes-kernel/linux/linux-yocto-4.9.21/0053-x86-cpu-Merge-bugs.c-and-bugs_64.c.patch deleted file mode 100644 index f540afd0..00000000 --- a/common/recipes-kernel/linux/linux-yocto-4.9.21/0053-x86-cpu-Merge-bugs.c-and-bugs_64.c.patch +++ /dev/null @@ -1,141 +0,0 @@ -From a1aca7fc1e1c73add0d8caa5773a4d393e5b60b1 Mon Sep 17 00:00:00 2001 -From: Borislav Petkov <bp@suse.de> -Date: Mon, 24 Oct 2016 19:38:43 +0200 -Subject: [PATCH 053/103] x86/cpu: Merge bugs.c and bugs_64.c - -commit 62a67e123e058a67db58bc6a14354dd037bafd0a upstream. - -Should be easier when following boot paths. It probably is a left over -from the x86 unification eons ago. - -No functionality change. - -Signed-off-by: Borislav Petkov <bp@suse.de> -Cc: Andy Lutomirski <luto@kernel.org> -Cc: Borislav Petkov <bp@alien8.de> -Cc: Brian Gerst <brgerst@gmail.com> -Cc: Denys Vlasenko <dvlasenk@redhat.com> -Cc: H. Peter Anvin <hpa@zytor.com> -Cc: Josh Poimboeuf <jpoimboe@redhat.com> -Cc: Linus Torvalds <torvalds@linux-foundation.org> -Cc: Peter Zijlstra <peterz@infradead.org> -Cc: Thomas Gleixner <tglx@linutronix.de> -Link: http://lkml.kernel.org/r/20161024173844.23038-3-bp@alien8.de -Signed-off-by: Ingo Molnar <mingo@kernel.org> -Signed-off-by: Razvan Ghitulete <rga@amazon.de> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - arch/x86/kernel/cpu/Makefile | 4 +--- - arch/x86/kernel/cpu/bugs.c | 26 ++++++++++++++++++++++---- - arch/x86/kernel/cpu/bugs_64.c | 33 --------------------------------- - 3 files changed, 23 insertions(+), 40 deletions(-) - delete mode 100644 arch/x86/kernel/cpu/bugs_64.c - -diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile -index 4a8697f..33b6367 100644 ---- a/arch/x86/kernel/cpu/Makefile -+++ b/arch/x86/kernel/cpu/Makefile -@@ -20,13 +20,11 @@ obj-y := intel_cacheinfo.o scattered.o topology.o - obj-y += common.o - obj-y += rdrand.o - obj-y += match.o -+obj-y += bugs.o - - obj-$(CONFIG_PROC_FS) += proc.o - obj-$(CONFIG_X86_FEATURE_NAMES) += capflags.o powerflags.o - --obj-$(CONFIG_X86_32) += bugs.o --obj-$(CONFIG_X86_64) += bugs_64.o -- - obj-$(CONFIG_CPU_SUP_INTEL) += intel.o - obj-$(CONFIG_CPU_SUP_AMD) += amd.o - obj-$(CONFIG_CPU_SUP_CYRIX_32) += cyrix.o -diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c -index bd17db1..a44ef52 100644 ---- a/arch/x86/kernel/cpu/bugs.c -+++ b/arch/x86/kernel/cpu/bugs.c -@@ -16,15 +16,19 @@ - #include <asm/msr.h> - #include <asm/paravirt.h> - #include <asm/alternative.h> -+#include <asm/pgtable.h> -+#include <asm/cacheflush.h> - - void __init check_bugs(void) - { - identify_boot_cpu(); --#ifndef CONFIG_SMP -- pr_info("CPU: "); -- print_cpu_info(&boot_cpu_data); --#endif - -+ if (!IS_ENABLED(CONFIG_SMP)) { -+ pr_info("CPU: "); -+ print_cpu_info(&boot_cpu_data); -+ } -+ -+#ifdef CONFIG_X86_32 - /* - * Check whether we are able to run this kernel safely on SMP. - * -@@ -40,4 +44,18 @@ void __init check_bugs(void) - alternative_instructions(); - - fpu__init_check_bugs(); -+#else /* CONFIG_X86_64 */ -+ alternative_instructions(); -+ -+ /* -+ * Make sure the first 2MB area is not mapped by huge pages -+ * There are typically fixed size MTRRs in there and overlapping -+ * MTRRs into large pages causes slow downs. -+ * -+ * Right now we don't do that with gbpages because there seems -+ * very little benefit for that case. -+ */ -+ if (!direct_gbpages) -+ set_memory_4k((unsigned long)__va(0), 1); -+#endif - } -diff --git a/arch/x86/kernel/cpu/bugs_64.c b/arch/x86/kernel/cpu/bugs_64.c -deleted file mode 100644 -index a972ac4..0000000 ---- a/arch/x86/kernel/cpu/bugs_64.c -+++ /dev/null -@@ -1,33 +0,0 @@ --/* -- * Copyright (C) 1994 Linus Torvalds -- * Copyright (C) 2000 SuSE -- */ -- --#include <linux/kernel.h> --#include <linux/init.h> --#include <asm/alternative.h> --#include <asm/bugs.h> --#include <asm/processor.h> --#include <asm/mtrr.h> --#include <asm/cacheflush.h> -- --void __init check_bugs(void) --{ -- identify_boot_cpu(); --#if !defined(CONFIG_SMP) -- pr_info("CPU: "); -- print_cpu_info(&boot_cpu_data); --#endif -- alternative_instructions(); -- -- /* -- * Make sure the first 2MB area is not mapped by huge pages -- * There are typically fixed size MTRRs in there and overlapping -- * MTRRs into large pages causes slow downs. -- * -- * Right now we don't do that with gbpages because there seems -- * very little benefit for that case. -- */ -- if (!direct_gbpages) -- set_memory_4k((unsigned long)__va(0), 1); --} --- -2.7.4 - |