Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-12 07:01:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

x86: unify pmd_index

Browse Source 
Impact: cleanup

Unify and demacro pmd_index.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
This commit is contained in:
Jeremy Fitzhardinge 2009-02-05 11:31:01 -08:00
parent 20063ca4eb
commit e24d7eee0b
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/x86/include/asm/pgtable.h
View File

@ -478,6 +478,17 @@ static inline struct page *pmd_page(pmd_t pmd)
return pfn_to_page(pmd_val(pmd) >> PAGE_SHIFT); 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 #if PAGETABLE_LEVELS > 2
static inline int pud_present(pud_t pud) static inline int pud_present(pud_t pud)
{ {

9
arch/x86/include/asm/pgtable_32.h
View File

@ -104,15 +104,6 @@ extern unsigned long pg0[];
static inline int pud_large(pud_t pud) { return 0; } 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] * the pte page can be thought of an array like this: pte_t[PTRS_PER_PTE]
* *

1
arch/x86/include/asm/pgtable_64.h
View File

@ -191,7 +191,6 @@ static inline int pud_large(pud_t pte)
} }
/* PMD - Level 2 access */ /* 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)) + \ #define pmd_offset(dir, address) ((pmd_t *)pud_page_vaddr(*(dir)) + \
pmd_index(address)) pmd_index(address))
#define pfn_pmd(nr, prot) (__pmd(((nr) << PAGE_SHIFT) | pgprot_val((prot)))) #define pfn_pmd(nr, prot) (__pmd(((nr) << PAGE_SHIFT) | pgprot_val((prot))))