diff --git a/[refs] b/[refs] index 47846f68cd3c..561d9c67be79 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1784b157c89cd2b5e6a3840abfdab6ed51f31d86 +refs/heads/master: cc780af5aca00d573eae0e926e1d4cf1439b580e diff --git a/trunk/arch/arm/mm/mm.h b/trunk/arch/arm/mm/mm.h index d2384106af9c..5b3d7d543659 100644 --- a/trunk/arch/arm/mm/mm.h +++ b/trunk/arch/arm/mm/mm.h @@ -5,14 +5,9 @@ extern pmd_t *top_pmd; #define TOP_PTE(x) pte_offset_kernel(top_pmd, x) -static inline pmd_t *pmd_off(pgd_t *pgd, unsigned long virt) -{ - return pmd_offset(pud_offset(pgd, virt), virt); -} - static inline pmd_t *pmd_off_k(unsigned long virt) { - return pmd_off(pgd_offset_k(virt), virt); + return pmd_offset(pud_offset(pgd_offset_k(virt), virt), virt); } struct mem_type {