From 388bf157748a3deb242bbc1883d45ec13deb50aa Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Tue, 22 May 2007 16:25:51 +1000 Subject: [PATCH] --- yaml --- r: 56771 b: refs/heads/master c: 5453e7723b95958f4591b2e0063573d8d53e7699 h: refs/heads/master i: 56769: edeb4c2c9645c9a525314bec800ca148b25a3827 56767: 4e9a18dc857aa154d21fef98fedd26277b0113f6 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/mm/mem.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 73ae5cbc35ac..5599b7f3f386 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 832a791c580a86cbeea5bb12a984d95b1f458539 +refs/heads/master: 5453e7723b95958f4591b2e0063573d8d53e7699 diff --git a/trunk/arch/powerpc/mm/mem.c b/trunk/arch/powerpc/mm/mem.c index 246eeea40ece..0266a94d83b6 100644 --- a/trunk/arch/powerpc/mm/mem.c +++ b/trunk/arch/powerpc/mm/mem.c @@ -310,11 +310,12 @@ void __init paging_init(void) #ifdef CONFIG_HIGHMEM map_page(PKMAP_BASE, 0, 0); /* XXX gross */ - pkmap_page_table = pte_offset_kernel(pmd_offset(pgd_offset_k - (PKMAP_BASE), PKMAP_BASE), PKMAP_BASE); + pkmap_page_table = pte_offset_kernel(pmd_offset(pud_offset(pgd_offset_k + (PKMAP_BASE), PKMAP_BASE), PKMAP_BASE), PKMAP_BASE); map_page(KMAP_FIX_BEGIN, 0, 0); /* XXX gross */ - kmap_pte = pte_offset_kernel(pmd_offset(pgd_offset_k - (KMAP_FIX_BEGIN), KMAP_FIX_BEGIN), KMAP_FIX_BEGIN); + kmap_pte = pte_offset_kernel(pmd_offset(pud_offset(pgd_offset_k + (KMAP_FIX_BEGIN), KMAP_FIX_BEGIN), KMAP_FIX_BEGIN), + KMAP_FIX_BEGIN); kmap_prot = PAGE_KERNEL; #endif /* CONFIG_HIGHMEM */