direct-io.hg

changeset 14253:56760c1de102

linux/x86-64 2.6.18: do away with pud_offset_k()
Signed-off-by: Jan Beulich <jbeulich@novell.com>
author kfraser@localhost.localdomain
date Mon Mar 05 15:06:13 2007 +0000 (2007-03-05)
parents f71157f1f1a0
children fe3fa645835f
files linux-2.6-xen-sparse/arch/x86_64/mm/init-xen.c linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/asm/pgtable.h
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/x86_64/mm/init-xen.c	Mon Mar 05 15:04:28 2007 +0000
     1.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/mm/init-xen.c	Mon Mar 05 15:06:13 2007 +0000
     1.3 @@ -1132,7 +1132,7 @@ int kern_addr_valid(unsigned long addr)
     1.4  	if (pgd_none(*pgd))
     1.5  		return 0;
     1.6  
     1.7 -	pud = pud_offset_k(pgd, addr);
     1.8 +	pud = pud_offset(pgd, addr);
     1.9  	if (pud_none(*pud))
    1.10  		return 0; 
    1.11  
     2.1 --- a/linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/asm/pgtable.h	Mon Mar 05 15:04:28 2007 +0000
     2.2 +++ b/linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/asm/pgtable.h	Mon Mar 05 15:06:13 2007 +0000
     2.3 @@ -403,19 +403,6 @@ static inline int pmd_large(pmd_t pte) {
     2.4  /* to find an entry in a page-table-directory. */
     2.5  #define pud_index(address) (((address) >> PUD_SHIFT) & (PTRS_PER_PUD-1))
     2.6  #define pud_offset(pgd, address) ((pud_t *) pgd_page(*(pgd)) + pud_index(address))
     2.7 -static inline pud_t *__pud_offset_k(pud_t *pud, unsigned long address)
     2.8 -{ 
     2.9 -	return pud + pud_index(address);
    2.10 -} 
    2.11 -
    2.12 -/* Find correct pud via the hidden fourth level page level: */
    2.13 -
    2.14 -/* This accesses the reference page table of the boot cpu. 
    2.15 -   Other CPUs get synced lazily via the page fault handler. */
    2.16 -static inline pud_t *pud_offset_k(pgd_t *pgd, unsigned long address)
    2.17 -{
    2.18 -	return pud_offset(pgd_offset_k(address), address);
    2.19 -}
    2.20  
    2.21  /* PMD  - Level 2 access */
    2.22  #define pmd_page_kernel(pmd) ((unsigned long) __va(pmd_val(pmd) & PTE_MASK))