Commit d0a160cb authored by Matthew Wilcox's avatar Matthew Wilcox Committed by Linus Torvalds

[PATCH] parisc: fix HPUX compile problem

Fix compile error when HPUX support is enabled
Committed-by: default avatarRandolph Chung <tausq@parisc-linux.org>
parent cc435c39
...@@ -750,7 +750,7 @@ map_hpux_gateway_page(struct task_struct *tsk, struct mm_struct *mm) ...@@ -750,7 +750,7 @@ map_hpux_gateway_page(struct task_struct *tsk, struct mm_struct *mm)
#if PTRS_PER_PMD == 1 #if PTRS_PER_PMD == 1
pmd = (pmd_t *)__pa(pg_dir); pmd = (pmd_t *)__pa(pg_dir);
#else #else
pmd = (pmd_t *) (PAGE_MASK & pgd_val(*pg_dir)); pmd = (pmd_t *) pgd_address(*pg_dir);
/* /*
* pmd is physical at this point * pmd is physical at this point
...@@ -761,7 +761,7 @@ map_hpux_gateway_page(struct task_struct *tsk, struct mm_struct *mm) ...@@ -761,7 +761,7 @@ map_hpux_gateway_page(struct task_struct *tsk, struct mm_struct *mm)
pmd = (pmd_t *) __pa(pmd); pmd = (pmd_t *) __pa(pmd);
} }
pgd_val(*pg_dir) = _PAGE_TABLE | (unsigned long) pmd; __pgd_val_set(*pg_dir, PxD_FLAG_PRESENT | PxD_FLAG_VALID | (unsigned long) pmd);
#endif #endif
/* now change pmd to kernel virtual addresses */ /* now change pmd to kernel virtual addresses */
...@@ -771,11 +771,11 @@ map_hpux_gateway_page(struct task_struct *tsk, struct mm_struct *mm) ...@@ -771,11 +771,11 @@ map_hpux_gateway_page(struct task_struct *tsk, struct mm_struct *mm)
* pg_table is physical at this point * pg_table is physical at this point
*/ */
pg_table = (pte_t *) (PAGE_MASK & pmd_val(*pmd)); pg_table = (pte_t *) pmd_address(*pmd);
if (!pg_table) if (!pg_table)
pg_table = (pte_t *) __pa(get_zeroed_page(GFP_KERNEL)); pg_table = (pte_t *) __pa(get_zeroed_page(GFP_KERNEL));
pmd_val(*pmd) = _PAGE_TABLE | (unsigned long) pg_table; __pmd_val_set(*pmd, PxD_FLAG_PRESENT | PxD_FLAG_VALID | (unsigned long) pg_table);
/* now change pg_table to kernel virtual addresses */ /* now change pg_table to kernel virtual addresses */
......
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