diff options
| author | John Stultz <john.stultz@linaro.org> | 2011-11-11 15:29:25 -0800 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2011-11-11 15:29:25 -0800 |
| commit | c3e5127312f97482a6a09c0df602c726675eff5b (patch) | |
| tree | 9082d8201a1daac5ff019ef50322d551711eb250 /arch/arm/include/asm/tlbflush.h | |
| parent | 5e537f041bd05cddee0d2a2fb3013ee642064cc6 (diff) | |
| parent | f171dfebbdf1de4b6ca267285739e190f95f84cc (diff) | |
Merge branch 'upstream/linaro-3.1' into linaro-android-3.1-agreen-rebaselinux-linaro-3.1-2011.11-0-android-0
Diffstat (limited to 'arch/arm/include/asm/tlbflush.h')
| -rw-r--r-- | arch/arm/include/asm/tlbflush.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/include/asm/tlbflush.h b/arch/arm/include/asm/tlbflush.h index 8077145698f..02b2f820398 100644 --- a/arch/arm/include/asm/tlbflush.h +++ b/arch/arm/include/asm/tlbflush.h @@ -471,7 +471,7 @@ static inline void local_flush_tlb_kernel_page(unsigned long kaddr) * these operations. This is typically used when we are removing * PMD entries. */ -static inline void flush_pmd_entry(pmd_t *pmd) +static inline void flush_pmd_entry(void *pmd) { const unsigned int __tlb_flag = __cpu_tlb_flags; @@ -487,7 +487,7 @@ static inline void flush_pmd_entry(pmd_t *pmd) dsb(); } -static inline void clean_pmd_entry(pmd_t *pmd) +static inline void clean_pmd_entry(void *pmd) { const unsigned int __tlb_flag = __cpu_tlb_flags; |