aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Beulich <jbeulich@novell.com>2006-03-25 10:29:03 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-25 12:10:52 -0500
commitc7ea1a96ec007ba761c9d5d11d788cd8fdd5c8b6 (patch)
treefab3b167a029a944502ae780721b0626f3808e0b
parentaf8fc1f528fd744e0b92cdb981eec0c8841f6f61 (diff)
[PATCH] x86_64: Use correct PUD for memory hotadd
Memory >39bits has a different PUD. Cc: "Tolentino, Matthew E" <matthew.e.tolentino@intel.com> Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--arch/x86_64/mm/init.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/mm/init.c b/arch/x86_64/mm/init.c
index 40ed13d263cd..675a45691338 100644
--- a/arch/x86_64/mm/init.c
+++ b/arch/x86_64/mm/init.c
@@ -344,7 +344,7 @@ void __meminit init_memory_mapping(unsigned long start, unsigned long end)
344 pud_t *pud; 344 pud_t *pud;
345 345
346 if (after_bootmem) 346 if (after_bootmem)
347 pud = pud_offset_k(pgd, __PAGE_OFFSET); 347 pud = pud_offset_k(pgd, start & PGDIR_MASK);
348 else 348 else
349 pud = alloc_low_page(&map, &pud_phys); 349 pud = alloc_low_page(&map, &pud_phys);
350 350