Commit e5f7f202 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86, pgtable.h: macro-ify *_page() methods 



The p?d_page() methods still rely on highlevel types and methods:

In file included from arch/x86/kernel/early_printk.c:18:
/home/mingo/tip/arch/x86/include/asm/pgtable.h: In function ‘pmd_page’:
/home/mingo/tip/arch/x86/include/asm/pgtable.h:516: error: implicit declaration of function ‘__pfn_to_section’
/home/mingo/tip/arch/x86/include/asm/pgtable.h:516: error: initialization makes pointer from integer without a cast
/home/mingo/tip/arch/x86/include/asm/pgtable.h:516: error: implicit declaration of function ‘__section_mem_map_addr’
/home/mingo/tip/arch/x86/include/asm/pgtable.h:516: error: return makes pointer from integer without a cast

So convert them to macros and document the type dependency.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 726c0d95

arch/x86/include/asm/pgtable.h

+15 −12
Original line number Original line Diff line number Diff line
@@ -473,10 +473,11 @@ static inline unsigned long pmd_page_vaddr(pmd_t pmd) 
	return (unsigned long)__va(pmd_val(pmd) & PTE_PFN_MASK);

	return (unsigned long)__va(pmd_val(pmd) & PTE_PFN_MASK);

}

}





static inline struct page *pmd_page(pmd_t pmd)

/*

{

 * Currently stuck as a macro due to indirect forward reference to

	return pfn_to_page(pmd_val(pmd) >> PAGE_SHIFT);

 * linux/mmzone.h's __section_mem_map_addr() definition:

}

 */

#define pmd_page(pmd)	pfn_to_page(pmd_val(pmd) >> PAGE_SHIFT)





/*

/*

 * the pmd page can be thought of an array like this: pmd_t[PTRS_PER_PMD]

 * the pmd page can be thought of an array like this: pmd_t[PTRS_PER_PMD]
@@ -543,10 +544,11 @@ static inline unsigned long pud_page_vaddr(pud_t pud) 
	return (unsigned long)__va((unsigned long)pud_val(pud) & PTE_PFN_MASK);

	return (unsigned long)__va((unsigned long)pud_val(pud) & PTE_PFN_MASK);

}

}





static inline struct page *pud_page(pud_t pud)

/*

{

 * Currently stuck as a macro due to indirect forward reference to

	return pfn_to_page(pud_val(pud) >> PAGE_SHIFT);

 * linux/mmzone.h's __section_mem_map_addr() definition:

}

 */

#define pud_page(pud)		pfn_to_page(pud_val(pud) >> PAGE_SHIFT)





/* Find an entry in the second-level page table.. */

/* Find an entry in the second-level page table.. */

static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address)

static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address)
@@ -582,10 +584,11 @@ static inline unsigned long pgd_page_vaddr(pgd_t pgd) 
	return (unsigned long)__va((unsigned long)pgd_val(pgd) & PTE_PFN_MASK);

	return (unsigned long)__va((unsigned long)pgd_val(pgd) & PTE_PFN_MASK);

}

}





static inline struct page *pgd_page(pgd_t pgd)

/*

{

 * Currently stuck as a macro due to indirect forward reference to

	return pfn_to_page(pgd_val(pgd) >> PAGE_SHIFT);

 * linux/mmzone.h's __section_mem_map_addr() definition:

}

 */

#define pgd_page(pgd)		pfn_to_page(pgd_val(pgd) >> PAGE_SHIFT)





/* to find an entry in a page-table-directory. */

/* to find an entry in a page-table-directory. */

static inline unsigned pud_index(unsigned long address)

static inline unsigned pud_index(unsigned long address)

CRA Git | Maintained and supported by SUSTech CRA and CCSE