[PATCH] i386/PAE: fix pud_page()

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Jan Beulich
Date: Thursday, October 30, 2008 - 3:37 am

To the unsuspecting user it is quite annoying that this broken and
inconsistent with x86-64 definition still exists.

Signed-off-by: Jan Beulich <jbeulich@novell.com>

---
 arch/x86/include/asm/pgtable-3level.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- linux-2.6.28-rc2/arch/x86/include/asm/pgtable-3level.h	2008-10-30 11:03:18.000000000 +0100
+++ 2.6.28-rc2-i386-pae-pud_page/arch/x86/include/asm/pgtable-3level.h	2008-10-29 11:35:24.000000000 +0100
@@ -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



--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH] i386/PAE: fix pud_page(), Jan Beulich, (Thu Oct 30, 3:37 am)
Re: [PATCH] i386/PAE: fix pud_page(), Ingo Molnar, (Thu Oct 30, 3:49 am)