From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sun, 20 Feb 2011 12:27:49 +0000 (+0000)
Subject: ARM: tlb: move noMMU tlb_flush() to asm/tlb.h
X-Git-Tag: 2.1b_release~5117^2~9
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=58e9c47fa0dd76693b2c85c010c7430a4de77c6d;p=platform%2Fkernel%2Fkernel-mfld-blackbay.git

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>
---

diff --git a/arch/arm/include/asm/tlb.h b/arch/arm/include/asm/tlb.h
index e769088..82dfe5d 100644
--- a/arch/arm/include/asm/tlb.h
+++ b/arch/arm/include/asm/tlb.h
@@ -22,6 +22,9 @@
 #ifndef CONFIG_MMU
 
 #include <linux/pagemap.h>
+
+#define tlb_flush(tlb)	((void) tlb)
+
 #include <asm-generic/tlb.h>
 
 #else /* !CONFIG_MMU */
diff --git a/arch/arm/include/asm/tlbflush.h b/arch/arm/include/asm/tlbflush.h
index ce7378e..d2005de 100644
--- a/arch/arm/include/asm/tlbflush.h
+++ b/arch/arm/include/asm/tlbflush.h
@@ -10,12 +10,7 @@
 #ifndef _ASMARM_TLBFLUSH_H
 #define _ASMARM_TLBFLUSH_H
 
-
-#ifndef CONFIG_MMU
-
-#define tlb_flush(tlb)	((void) tlb)
-
-#else /* CONFIG_MMU */
+#ifdef CONFIG_MMU
 
 #include <asm/glue.h>