diff options
| author | Jeremy Fitzhardinge <jeremy@goop.org> | 2009-02-05 11:31:01 -0800 |
|---|---|---|
| committer | Jeremy Fitzhardinge <jeremy@goop.org> | 2009-02-06 12:31:49 -0800 |
| commit | e24d7eee0beda24504bf6a4aa03be68328557475 (patch) | |
| tree | db6af59008420958bd27e7288fcc14add47bee74 /arch/x86/include/asm | |
| parent | 20063ca4eb26d4b10f01d59925deea4aeee415e8 (diff) | |
| download | kernel_samsung_tuna-e24d7eee0beda24504bf6a4aa03be68328557475.zip kernel_samsung_tuna-e24d7eee0beda24504bf6a4aa03be68328557475.tar.gz kernel_samsung_tuna-e24d7eee0beda24504bf6a4aa03be68328557475.tar.bz2 | |
x86: unify pmd_index
Impact: cleanup
Unify and demacro pmd_index.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Diffstat (limited to 'arch/x86/include/asm')
| -rw-r--r-- | arch/x86/include/asm/pgtable.h | 11 | ||||
| -rw-r--r-- | arch/x86/include/asm/pgtable_32.h | 9 | ||||
| -rw-r--r-- | arch/x86/include/asm/pgtable_64.h | 1 |
3 files changed, 11 insertions, 10 deletions
diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h index 38330d6..4ec24b6 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h @@ -478,6 +478,17 @@ static inline struct page *pmd_page(pmd_t pmd) return pfn_to_page(pmd_val(pmd) >> PAGE_SHIFT); } +/* + * the pmd page can be thought of an array like this: pmd_t[PTRS_PER_PMD] + * + * this macro returns the index of the entry in the pmd page which would + * control the given virtual address + */ +static inline unsigned pmd_index(unsigned long address) +{ + return (address >> PMD_SHIFT) & (PTRS_PER_PMD - 1); +} + #if PAGETABLE_LEVELS > 2 static inline int pud_present(pud_t pud) { diff --git a/arch/x86/include/asm/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h index 8714110..40b0662 100644 --- a/arch/x86/include/asm/pgtable_32.h +++ b/arch/x86/include/asm/pgtable_32.h @@ -105,15 +105,6 @@ extern unsigned long pg0[]; static inline int pud_large(pud_t pud) { return 0; } /* - * the pmd page can be thought of an array like this: pmd_t[PTRS_PER_PMD] - * - * this macro returns the index of the entry in the pmd page which would - * control the given virtual address - */ -#define pmd_index(address) \ - (((address) >> PMD_SHIFT) & (PTRS_PER_PMD - 1)) - -/* * the pte page can be thought of an array like this: pte_t[PTRS_PER_PTE] * * this macro returns the index of the entry in the pte page which would diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h index 97f24d2..15f42d6 100644 --- a/arch/x86/include/asm/pgtable_64.h +++ b/arch/x86/include/asm/pgtable_64.h @@ -191,7 +191,6 @@ static inline int pud_large(pud_t pte) } /* PMD - Level 2 access */ -#define pmd_index(address) (((address) >> PMD_SHIFT) & (PTRS_PER_PMD - 1)) #define pmd_offset(dir, address) ((pmd_t *)pud_page_vaddr(*(dir)) + \ pmd_index(address)) #define pfn_pmd(nr, prot) (__pmd(((nr) << PAGE_SHIFT) | pgprot_val((prot)))) |