Messages in this thread Patch in this message | | | Date | Sat, 23 Jun 2018 05:31:20 -0700 | From | "tip-bot for Kirill A. Shutemov" <> | Subject | [tip:x86/urgent] x86/mm: Fix 'no5lvl' handling |
| |
Commit-ID: 2458e53ff74cd1063ed3e00459da1d35c559d369 Gitweb: https://git.kernel.org/tip/2458e53ff74cd1063ed3e00459da1d35c559d369 Author: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> AuthorDate: Sat, 23 Jun 2018 01:08:41 +0300 Committer: Thomas Gleixner <tglx@linutronix.de> CommitDate: Sat, 23 Jun 2018 14:20:37 +0200
x86/mm: Fix 'no5lvl' handling
early_identify_cpu() has to use early version of pgtable_l5_enabled() that doesn't rely on cpu_feature_enabled().
Defining USE_EARLY_PGTABLE_L5 before all includes does the trick.
I lost the define in one of reworks of the original patch.
Fixes: 372fddf70904 ("x86/mm: Introduce the 'no5lvl' kernel parameter") Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: "H. Peter Anvin" <hpa@zytor.com> Link: https://lkml.kernel.org/r/20180622220841.54135-3-kirill.shutemov@linux.intel.com
--- arch/x86/kernel/cpu/common.c | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index 0df7151cfef4..eb4cb3efd20e 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -1,3 +1,6 @@ +/* cpu_feature_enabled() cannot be used this early */ +#define USE_EARLY_PGTABLE_L5 + #include <linux/bootmem.h> #include <linux/linkage.h> #include <linux/bitops.h>
| |