From de10115fed531649b18c116421169ee852b6daed Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sun, 20 Feb 2011 12:27:49 +0000
Subject: [PATCH] --- yaml --- r: 233493 b: refs/heads/master c:
 58e9c47fa0dd76693b2c85c010c7430a4de77c6d h: refs/heads/master i:   233491:
 ff23232ef2e388d4b36739b5e655b9c1142df165 v: v3

---
 [refs]                                | 2 +-
 trunk/arch/arm/include/asm/tlb.h      | 3 +++
 trunk/arch/arm/include/asm/tlbflush.h | 7 +------
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 37f8537b6d6b..bdde583a2d8a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 06824ba824b3e9f2fedb38bee79af0643198ed7f
+refs/heads/master: 58e9c47fa0dd76693b2c85c010c7430a4de77c6d
diff --git a/trunk/arch/arm/include/asm/tlb.h b/trunk/arch/arm/include/asm/tlb.h
index e7690887b958..82dfe5d0c41e 100644
--- a/trunk/arch/arm/include/asm/tlb.h
+++ b/trunk/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/trunk/arch/arm/include/asm/tlbflush.h b/trunk/arch/arm/include/asm/tlbflush.h
index ce7378ea15a2..d2005de383b8 100644
--- a/trunk/arch/arm/include/asm/tlbflush.h
+++ b/trunk/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>