diff options
| author |   Kirill A. Shutemov <kirill.shutemov@linux.intel.com> | 2018-06-23 01:08:41 +0300 |
|---|---|---|
| committer |   Thomas Gleixner <tglx@linutronix.de> | 2018-06-23 14:20:37 +0200 |
| commit | 2458e53ff74cd1063ed3e00459da1d35c559d369 (patch) | |
| tree | 1f969e50a4c237e4482a417af7c68f89e68e9938 | |
| parent | Revert "x86/mm: Mark __pgtable_l5_enabled __initdata" (diff) | |
| download | linux-dev-2458e53ff74cd1063ed3e00459da1d35c559d369.tar.xz linux-dev-2458e53ff74cd1063ed3e00459da1d35c559d369.zip | |
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
| -rw-r--r-- | arch/x86/kernel/cpu/common.c | 3 |
1 files changed, 3 insertions, 0 deletions
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> |