aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-05-26 14:50:30 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-05-26 14:50:30 -0400
commitcc780af5aca00d573eae0e926e1d4cf1439b580e (patch)
tree0f064010d2935ec07737a10f63728ef36668b4d9
parent1784b157c89cd2b5e6a3840abfdab6ed51f31d86 (diff)
ARM: kill pmd_off()
pmd_off() has only one user, so lets consolidate this into its only user. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/mm/mm.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/arm/mm/mm.h b/arch/arm/mm/mm.h
index d2384106af9..5b3d7d54365 100644
--- a/arch/arm/mm/mm.h
+++ b/arch/arm/mm/mm.h
@@ -5,14 +5,9 @@ extern pmd_t *top_pmd;
5 5
6#define TOP_PTE(x) pte_offset_kernel(top_pmd, x) 6#define TOP_PTE(x) pte_offset_kernel(top_pmd, x)
7 7
8static inline pmd_t *pmd_off(pgd_t *pgd, unsigned long virt)
9{
10 return pmd_offset(pud_offset(pgd, virt), virt);
11}
12
13static inline pmd_t *pmd_off_k(unsigned long virt) 8static inline pmd_t *pmd_off_k(unsigned long virt)
14{ 9{
15 return pmd_off(pgd_offset_k(virt), virt); 10 return pmd_offset(pud_offset(pgd_offset_k(virt), virt), virt);
16} 11}
17 12
18struct mem_type { 13struct mem_type {