powerpc: Add pmd_pfn()

This is straightforward for everything except nohash64 where we
indirect through pmd_page().  There must be a better way to do this.
Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
parent 177bd2a9
...@@ -372,8 +372,8 @@ static inline void __ptep_set_access_flags(struct vm_area_struct *vma, ...@@ -372,8 +372,8 @@ static inline void __ptep_set_access_flags(struct vm_area_struct *vma,
#define __HAVE_ARCH_PTE_SAME #define __HAVE_ARCH_PTE_SAME
#define pte_same(A,B) (((pte_val(A) ^ pte_val(B)) & ~_PAGE_HASHPTE) == 0) #define pte_same(A,B) (((pte_val(A) ^ pte_val(B)) & ~_PAGE_HASHPTE) == 0)
#define pmd_page(pmd) \ #define pmd_pfn(pmd) (pmd_val(pmd) >> PAGE_SHIFT)
pfn_to_page(pmd_val(pmd) >> PAGE_SHIFT) #define pmd_page(pmd) pfn_to_page(pmd_pfn(pmd))
/* /*
* Encode and decode a swap entry. * Encode and decode a swap entry.
......
...@@ -349,15 +349,14 @@ static inline int pte_young(pte_t pte) ...@@ -349,15 +349,14 @@ static inline int pte_young(pte_t pte)
* of the pte page. -- paulus * of the pte page. -- paulus
*/ */
#ifndef CONFIG_BOOKE #ifndef CONFIG_BOOKE
#define pmd_page(pmd) \ #define pmd_pfn(pmd) (pmd_val(pmd) >> PAGE_SHIFT)
pfn_to_page(pmd_val(pmd) >> PAGE_SHIFT)
#else #else
#define pmd_page_vaddr(pmd) \ #define pmd_page_vaddr(pmd) \
((unsigned long)(pmd_val(pmd) & ~(PTE_TABLE_SIZE - 1))) ((unsigned long)(pmd_val(pmd) & ~(PTE_TABLE_SIZE - 1)))
#define pmd_page(pmd) \ #define pmd_pfn(pmd) (__pa(pmd_val(pmd)) >> PAGE_SHIFT)
pfn_to_page((__pa(pmd_val(pmd)) >> PAGE_SHIFT))
#endif #endif
#define pmd_page(pmd) pfn_to_page(pmd_pfn(pmd))
/* /*
* Encode and decode a swap entry. * Encode and decode a swap entry.
* Note that the bits we use in a PTE for representing a swap entry * Note that the bits we use in a PTE for representing a swap entry
......
...@@ -142,6 +142,7 @@ static inline pte_t pmd_pte(pmd_t pmd) ...@@ -142,6 +142,7 @@ static inline pte_t pmd_pte(pmd_t pmd)
#define pmd_present(pmd) (!pmd_none(pmd)) #define pmd_present(pmd) (!pmd_none(pmd))
#define pmd_page_vaddr(pmd) (pmd_val(pmd) & ~PMD_MASKED_BITS) #define pmd_page_vaddr(pmd) (pmd_val(pmd) & ~PMD_MASKED_BITS)
extern struct page *pmd_page(pmd_t pmd); extern struct page *pmd_page(pmd_t pmd);
#define pmd_pfn(pmd) (page_to_pfn(pmd_page(pmd)))
static inline void pud_set(pud_t *pudp, unsigned long val) static inline void pud_set(pud_t *pudp, unsigned long val)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment