Merge branch 'linus' into x86/step

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 27de2435e008..306049edd553 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -644,7 +644,7 @@ static unsigned long __init kernel_physical_mapping_init(unsigned long start,
                 unsigned long pud_phys;
                 pud_t *pud;
 
-                next = start + PGDIR_SIZE;
+                next = (start + PGDIR_SIZE) & PGDIR_MASK;
                 if (next > end)
                         next = end;