From da5860ec762cc4416f42318b3ad5117fa6a7eb89 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Thu, 30 Oct 2008 10:37:21 +0000 Subject: [PATCH] --- yaml --- r: 118203 b: refs/heads/master c: ab00fee30cddf975200b3c97aef25bea144a0d89 h: refs/heads/master i: 118201: 176f9028158e9e612aa78f9edf17b33151278394 118199: 6f887d7db7b5d4376fc6be5eb7931a82e9782d28 v: v3 --- [refs] | 2 +- trunk/arch/x86/include/asm/pgtable-3level.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 172f181c5022..148cc9956e0f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fe8b868eccb9f85a0e231e35f0abac5b39bac801 +refs/heads/master: ab00fee30cddf975200b3c97aef25bea144a0d89 diff --git a/trunk/arch/x86/include/asm/pgtable-3level.h b/trunk/arch/x86/include/asm/pgtable-3level.h index fb16cec702e4..52597aeadfff 100644 --- a/trunk/arch/x86/include/asm/pgtable-3level.h +++ b/trunk/arch/x86/include/asm/pgtable-3level.h @@ -120,13 +120,13 @@ static inline void pud_clear(pud_t *pudp) write_cr3(pgd); } -#define pud_page(pud) ((struct page *) __va(pud_val(pud) & PTE_PFN_MASK)) +#define pud_page(pud) pfn_to_page(pud_val(pud) >> PAGE_SHIFT) #define pud_page_vaddr(pud) ((unsigned long) __va(pud_val(pud) & PTE_PFN_MASK)) /* Find an entry in the second-level page table.. */ -#define pmd_offset(pud, address) ((pmd_t *)pud_page(*(pud)) + \ +#define pmd_offset(pud, address) ((pmd_t *)pud_page_vaddr(*(pud)) + \ pmd_index(address)) #ifdef CONFIG_SMP