Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20063ca4 authored Feb 05, 2009 by Jeremy Fitzhardinge

x86: unify pmd_page



Impact: cleanup

Unify and demacro pmd_page.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>

parent 3ffb3564

arch/x86/include/asm/pgtable.h

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -473,6 +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)
			{
			return pfn_to_page(pmd_val(pmd) >> PAGE_SHIFT);
			}

	#if PAGETABLE_LEVELS > 2		#if PAGETABLE_LEVELS > 2
	static inline int pud_present(pud_t pud)		static inline int pud_present(pud_t pud)
	{		{

arch/x86/include/asm/pgtable_32.h

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -124,8 +124,6 @@ static inline int pud_large(pud_t pud) { return 0; }
	#define pte_offset_kernel(dir, address) \		#define pte_offset_kernel(dir, address) \
	((pte_t )pmd_page_vaddr((dir)) + pte_index((address)))		((pte_t )pmd_page_vaddr((dir)) + pte_index((address)))

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

	#if defined(CONFIG_HIGHPTE)		#if defined(CONFIG_HIGHPTE)
	#define pte_offset_map(dir, address) \		#define pte_offset_map(dir, address) \
	((pte_t )kmap_atomic_pte(pmd_page((dir)), KM_PTE0) + \		((pte_t )kmap_atomic_pte(pmd_page((dir)), KM_PTE0) + \

arch/x86/include/asm/pgtable_64.h

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -191,8 +191,6 @@ static inline int pud_large(pud_t pte)
	}		}

	/* PMD - Level 2 access */		/* PMD - Level 2 access */
	#define pmd_page(pmd) (pfn_to_page(pmd_val((pmd)) >> PAGE_SHIFT))

	#define pmd_index(address) (((address) >> PMD_SHIFT) & (PTRS_PER_PMD - 1))		#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))