From c4aeae3bdf203c0749fbb79d3b9601c538fe123b Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Sat, 25 Mar 2006 16:29:03 +0100 Subject: [PATCH] --- yaml --- r: 23791 b: refs/heads/master c: c7ea1a96ec007ba761c9d5d11d788cd8fdd5c8b6 h: refs/heads/master i: 23789: 5e42e9269f081c019890ec51a39a9e7b0fabe450 23787: 793e118c7c8b30dd6f4cb9526baea30131f2dbc6 23783: 8d4f778804f5826324007f59dd12d8d85d923dfc 23775: 352578ee32977272ab8e9d5ea36fbddbb2f86709 v: v3 --- [refs] | 2 +- trunk/arch/x86_64/mm/init.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 5263ca8188c9..b34e3d3ab436 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: af8fc1f528fd744e0b92cdb981eec0c8841f6f61 +refs/heads/master: c7ea1a96ec007ba761c9d5d11d788cd8fdd5c8b6 diff --git a/trunk/arch/x86_64/mm/init.c b/trunk/arch/x86_64/mm/init.c index 40ed13d263cd..675a45691338 100644 --- a/trunk/arch/x86_64/mm/init.c +++ b/trunk/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);