Jan Beulich
2007-Mar-05 11:18 UTC
[Xen-devel] [PATCH 9/10] linux/x86-64 2.6.18: do away with pud_offset_k()
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Index: head-2007-02-27/arch/x86_64/mm/init-xen.c
==================================================================---
head-2007-02-27.orig/arch/x86_64/mm/init-xen.c 2007-03-05 10:00:18.000000000
+0100
+++ head-2007-02-27/arch/x86_64/mm/init-xen.c 2007-03-05 10:13:48.000000000
+0100
@@ -1125,7 +1125,7 @@ int kern_addr_valid(unsigned long addr)
if (pgd_none(*pgd))
return 0;
- pud = pud_offset_k(pgd, addr);
+ pud = pud_offset(pgd, addr);
if (pud_none(*pud))
return 0;
Index: head-2007-02-27/include/asm-x86_64/mach-xen/asm/pgtable.h
==================================================================---
head-2007-02-27.orig/include/asm-x86_64/mach-xen/asm/pgtable.h 2007-03-05
10:00:18.000000000 +0100
+++ head-2007-02-27/include/asm-x86_64/mach-xen/asm/pgtable.h 2007-02-27
16:27:37.000000000 +0100
@@ -403,19 +403,6 @@ static inline int pmd_large(pmd_t pte) {
/* to find an entry in a page-table-directory. */
#define pud_index(address) (((address) >> PUD_SHIFT) &
(PTRS_PER_PUD-1))
#define pud_offset(pgd, address) ((pud_t *) pgd_page(*(pgd)) +
pud_index(address))
-static inline pud_t *__pud_offset_k(pud_t *pud, unsigned long address)
-{
- return pud + pud_index(address);
-}
-
-/* Find correct pud via the hidden fourth level page level: */
-
-/* This accesses the reference page table of the boot cpu.
- Other CPUs get synced lazily via the page fault handler. */
-static inline pud_t *pud_offset_k(pgd_t *pgd, unsigned long address)
-{
- return pud_offset(pgd_offset_k(address), address);
-}
/* PMD - Level 2 access */
#define pmd_page_kernel(pmd) ((unsigned long) __va(pmd_val(pmd) &
PTE_MASK))
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel