summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorJan Beulich <jbeulich@novell.com>2006-03-25 16:29:03 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-25 18:10:52 +0100
commitc7ea1a96ec007ba761c9d5d11d788cd8fdd5c8b6 (patch)
treefab3b167a029a944502ae780721b0626f3808e0b /arch
parent[PATCH] x86_64: Update defconfig (diff)
downloadlinux-c7ea1a96ec007ba761c9d5d11d788cd8fdd5c8b6.tar.xz
linux-c7ea1a96ec007ba761c9d5d11d788cd8fdd5c8b6.zip
[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>
Diffstat (limited to 'arch')
-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)
pud_t *pud;
if (after_bootmem)
- pud = pud_offset_k(pgd, __PAGE_OFFSET);
+ pud = pud_offset_k(pgd, start & PGDIR_MASK);
else
pud = alloc_low_page(&map, &pud_phys);