summaryrefslogtreecommitdiff
path: root/arch/x86/mm/kaslr.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2019-04-26 13:01:33 +0300
committerIngo Molnar <mingo@kernel.org>2019-04-26 13:01:33 +0300
commitda398dbd7d871bae332a800f7d194af18a2a9058 (patch)
tree2dbdc51bd9caa1539480b3d80d082adfdb8179c3 /arch/x86/mm/kaslr.c
parent2792107dc3af29ecc1a9b3dc5bc873dac4b61cd6 (diff)
parent8113a85f872003a9f5c58f9f143054b0d8ec73a5 (diff)
downloadlinux-da398dbd7d871bae332a800f7d194af18a2a9058.tar.xz
Merge branch 'linus' into x86/mm, to pick up dependent fix
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/mm/kaslr.c')
-rw-r--r--arch/x86/mm/kaslr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/kaslr.c b/arch/x86/mm/kaslr.c
index f6ba2791eeb5..dc3f058bdf9b 100644
--- a/arch/x86/mm/kaslr.c
+++ b/arch/x86/mm/kaslr.c
@@ -94,7 +94,7 @@ void __init kernel_randomize_memory(void)
if (!kaslr_memory_enabled())
return;
- kaslr_regions[0].size_tb = 1 << (__PHYSICAL_MASK_SHIFT - TB_SHIFT);
+ kaslr_regions[0].size_tb = 1 << (MAX_PHYSMEM_BITS - TB_SHIFT);
kaslr_regions[1].size_tb = VMALLOC_SIZE_TB;
/*