diff options
| author | Ingo Molnar | 2019-04-26 12:01:33 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2019-04-26 12:01:33 +0200 |
| commit | da398dbd7d871bae332a800f7d194af18a2a9058 (patch) | |
| tree | 2dbdc51bd9caa1539480b3d80d082adfdb8179c3 /arch/x86/mm/kaslr.c | |
| parent | x86/Kconfig: Deprecate DISCONTIGMEM support for 32-bit x86 (diff) | |
| parent | Merge tag 'ceph-for-5.1-rc7' of git://github.com/ceph/ceph-client (diff) | |
| download | kernel-qcow2-linux-da398dbd7d871bae332a800f7d194af18a2a9058.tar.gz kernel-qcow2-linux-da398dbd7d871bae332a800f7d194af18a2a9058.tar.xz kernel-qcow2-linux-da398dbd7d871bae332a800f7d194af18a2a9058.zip | |
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.c | 2 |
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; /* |