From 330924b1a0f9dbd3afb0dd8fbd3796a568b19cf8 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Thu, 23 Jun 2011 14:24:09 +0100
Subject: [PATCH] --- yaml --- r: 258255 b: refs/heads/master c:
 0853f96f13e0b60f1c319bcd7f6a3a84d0d1e706 h: refs/heads/master i:   258253:
 753f94d0bf25d6b154b60077519d82a619b527ab   258251:
 2baa5aac618927f85fcd61fcf8acaa8530e3f84f   258247:
 1fea0d0b14345f068027a42ed962912d0b33372e   258239:
 3a37963ce6f7fa197e23b52a3d2b3ce5a5849442 v: v3

---
 [refs]                               | 2 +-
 trunk/arch/arm/include/asm/suspend.h | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 94067f03217c..2f20092ccd10 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2c74a0cefa463a7a483b07ba4d2ea8e4ec7b996c
+refs/heads/master: 0853f96f13e0b60f1c319bcd7f6a3a84d0d1e706
diff --git a/trunk/arch/arm/include/asm/suspend.h b/trunk/arch/arm/include/asm/suspend.h
index 8d5b4461c205..f8db9d096bc7 100644
--- a/trunk/arch/arm/include/asm/suspend.h
+++ b/trunk/arch/arm/include/asm/suspend.h
@@ -2,6 +2,7 @@
 #define __ASM_ARM_SUSPEND_H
 
 #include <asm/memory.h>
+#include <asm/tlbflush.h>
 
 extern void cpu_resume(void);
 
@@ -14,6 +15,7 @@ static inline void cpu_suspend(unsigned long arg, void (*fn)(unsigned long))
 	extern void __cpu_suspend(int, long, unsigned long,
 				  void (*)(unsigned long));
 	__cpu_suspend(0, PHYS_OFFSET - PAGE_OFFSET, arg, fn);
+	flush_tlb_all();
 }
 
 #endif