.. | .. |
---|
650 | 650 | return __pud_to_phys(pud); |
---|
651 | 651 | } |
---|
652 | 652 | |
---|
653 | | -static inline unsigned long pud_page_vaddr(pud_t pud) |
---|
| 653 | +static inline pmd_t *pud_pgtable(pud_t pud) |
---|
654 | 654 | { |
---|
655 | | - return (unsigned long)__va(pud_page_paddr(pud)); |
---|
| 655 | + return (pmd_t *)__va(pud_page_paddr(pud)); |
---|
656 | 656 | } |
---|
657 | 657 | |
---|
658 | 658 | /* Find an entry in the second-level page table. */ |
---|
.. | .. |
---|
711 | 711 | return __p4d_to_phys(p4d); |
---|
712 | 712 | } |
---|
713 | 713 | |
---|
714 | | -static inline unsigned long p4d_page_vaddr(p4d_t p4d) |
---|
| 714 | +static inline pud_t *p4d_pgtable(p4d_t p4d) |
---|
715 | 715 | { |
---|
716 | | - return (unsigned long)__va(p4d_page_paddr(p4d)); |
---|
| 716 | + return (pud_t *)__va(p4d_page_paddr(p4d)); |
---|
717 | 717 | } |
---|
718 | 718 | |
---|
719 | 719 | /* Find an entry in the frst-level page table. */ |
---|
.. | .. |
---|
996 | 996 | */ |
---|
997 | 997 | static inline bool arch_faults_on_old_pte(void) |
---|
998 | 998 | { |
---|
999 | | - /* The register read below requires a stable CPU to make any sense */ |
---|
1000 | | - cant_migrate(); |
---|
| 999 | + WARN_ON(preemptible()); |
---|
1001 | 1000 | |
---|
1002 | 1001 | return !cpu_has_hw_af(); |
---|
1003 | 1002 | } |
---|