1 files changed, 3 insertions, 3 deletions

diff --git a/arch/x86/mm/kaslr.c b/arch/x86/mm/kaslr.c
index 641169d38184..615cc03ced84 100644
--- a/arch/x86/mm/kaslr.c
+++ b/arch/x86/mm/kaslr.c
@@ -124,7 +124,7 @@ void __init kernel_randomize_memory(void)
                  */
                 entropy = remain_entropy / (ARRAY_SIZE(kaslr_regions) - i);
                 prandom_bytes_state(&rand_state, &rand, sizeof(rand));
-                if (IS_ENABLED(CONFIG_X86_5LEVEL))
+                if (pgtable_l5_enabled)
                         entropy = (rand % (entropy + 1)) & P4D_MASK;
                 else
                         entropy = (rand % (entropy + 1)) & PUD_MASK;
@@ -136,7 +136,7 @@ void __init kernel_randomize_memory(void)
                  * randomization alignment.
                  */
                 vaddr += get_padding(&kaslr_regions[i]);
-                if (IS_ENABLED(CONFIG_X86_5LEVEL))
+                if (pgtable_l5_enabled)
                         vaddr = round_up(vaddr + 1, P4D_SIZE);
                 else
                         vaddr = round_up(vaddr + 1, PUD_SIZE);
@@ -212,7 +212,7 @@ void __meminit init_trampoline(void)
                 return;
         }
 
-        if (IS_ENABLED(CONFIG_X86_5LEVEL))
+        if (pgtable_l5_enabled)
                 init_trampoline_p4d();
         else
                 init_trampoline_pud();