kaiser: add "nokaiser" boot option, using ALTERNATIVE

[android-x86/kernel.git] / arch / x86 / mm / init.c

diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index 0381638..1e779bc 100644 (file)
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -177,7 +177,7 @@ static void __init probe_page_size_mask(void)
                cr4_set_bits_and_update_boot(X86_CR4_PSE);
 
        /* Enable PGE if available */
-       if (boot_cpu_has(X86_FEATURE_PGE)) {
+       if (boot_cpu_has(X86_FEATURE_PGE) && !kaiser_enabled) {
                cr4_set_bits_and_update_boot(X86_CR4_PGE);
                __supported_pte_mask |= _PAGE_GLOBAL;
        } else