diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-02-20 07:27:49 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-02-21 14:29:28 -0500 |
| commit | 58e9c47fa0dd76693b2c85c010c7430a4de77c6d (patch) | |
| tree | 8b315bd55179023cc22ec50b8933a3d881b0376a | |
| parent | 06824ba824b3e9f2fedb38bee79af0643198ed7f (diff) | |
ARM: tlb: move noMMU tlb_flush() to asm/tlb.h
There's no need to noMMU to put tlb_flush() in asm/tlbflush.h - it's
part of the tlb shootdown interface. Move it to asm/tlb.h instead, as
per x86.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | arch/arm/include/asm/tlb.h | 3 | ||||
| -rw-r--r-- | arch/arm/include/asm/tlbflush.h | 7 |
2 files changed, 4 insertions, 6 deletions
diff --git a/arch/arm/include/asm/tlb.h b/arch/arm/include/asm/tlb.h index e7690887b958..82dfe5d0c41e 100644 --- a/arch/arm/include/asm/tlb.h +++ b/arch/arm/include/asm/tlb.h | |||
| @@ -22,6 +22,9 @@ | |||
| 22 | #ifndef CONFIG_MMU | 22 | #ifndef CONFIG_MMU |
| 23 | 23 | ||
| 24 | #include <linux/pagemap.h> | 24 | #include <linux/pagemap.h> |
| 25 | |||
| 26 | #define tlb_flush(tlb) ((void) tlb) | ||
| 27 | |||
| 25 | #include <asm-generic/tlb.h> | 28 | #include <asm-generic/tlb.h> |
| 26 | 29 | ||
| 27 | #else /* !CONFIG_MMU */ | 30 | #else /* !CONFIG_MMU */ |
diff --git a/arch/arm/include/asm/tlbflush.h b/arch/arm/include/asm/tlbflush.h index ce7378ea15a2..d2005de383b8 100644 --- a/arch/arm/include/asm/tlbflush.h +++ b/arch/arm/include/asm/tlbflush.h | |||
| @@ -10,12 +10,7 @@ | |||
| 10 | #ifndef _ASMARM_TLBFLUSH_H | 10 | #ifndef _ASMARM_TLBFLUSH_H |
| 11 | #define _ASMARM_TLBFLUSH_H | 11 | #define _ASMARM_TLBFLUSH_H |
| 12 | 12 | ||
| 13 | 13 | #ifdef CONFIG_MMU | |
| 14 | #ifndef CONFIG_MMU | ||
| 15 | |||
| 16 | #define tlb_flush(tlb) ((void) tlb) | ||
| 17 | |||
| 18 | #else /* CONFIG_MMU */ | ||
| 19 | 14 | ||
| 20 | #include <asm/glue.h> | 15 | #include <asm/glue.h> |
| 21 | 16 | ||