From 8f669a0f2f40b4d8c532cd5d90a47a17c6f32508 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Fri, 14 Jan 2011 12:06:26 +0000
Subject: [PATCH] --- yaml --- r: 231295 b: refs/heads/master c:
 30b99d07b7e08d0e6bcc2f0b924828c03e67f881 h: refs/heads/master i:   231293:
 17b3bd02d1b6ba64d96f485de1ea7ecfedc42629   231291:
 201bf60a3651dbe4047c13fef3c20ca1b985a854   231287:
 065553fc6ba020255dbddadf1fe3ad4ef722dca4   231279:
 ddc36a7d418b3818e3068966f1ad71d9e9139474   231263:
 d15f3ff01d4406b5855d1cc03e543a0af8165845   231231:
 de9a587ddd21b9763fd49b3dd24d66fc0d0b19f5   231167:
 8c6008e0f04743607ab938ad81d1366ce2ee3286 v: v3

---
 [refs]                                | 2 +-
 trunk/arch/arm/mach-s5pv310/hotplug.c | 4 ++--
 trunk/arch/arm/mach-tegra/hotplug.c   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 27aaf90ed61a..eca6ac61d0fc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4d2692a736c95240100755ba98b2403e11f12e06
+refs/heads/master: 30b99d07b7e08d0e6bcc2f0b924828c03e67f881
diff --git a/trunk/arch/arm/mach-s5pv310/hotplug.c b/trunk/arch/arm/mach-s5pv310/hotplug.c
index afa5392d9fc0..c24235c89eed 100644
--- a/trunk/arch/arm/mach-s5pv310/hotplug.c
+++ b/trunk/arch/arm/mach-s5pv310/hotplug.c
@@ -30,10 +30,10 @@ static inline void cpu_enter_lowpower(void)
 	 * Turn off coherency
 	 */
 	"	mrc	p15, 0, %0, c1, c0, 1\n"
-	"	bic	%0, %0, %2\n"
+	"	bic	%0, %0, #0x20\n"
 	"	mcr	p15, 0, %0, c1, c0, 1\n"
 	"	mrc	p15, 0, %0, c1, c0, 0\n"
-	"	bic	%0, %0, #0x04\n"
+	"	bic	%0, %0, %2\n"
 	"	mcr	p15, 0, %0, c1, c0, 0\n"
 	  : "=&r" (v)
 	  : "r" (0), "Ir" (CR_C)
diff --git a/trunk/arch/arm/mach-tegra/hotplug.c b/trunk/arch/arm/mach-tegra/hotplug.c
index a5cb1ce76ff2..f3294040d357 100644
--- a/trunk/arch/arm/mach-tegra/hotplug.c
+++ b/trunk/arch/arm/mach-tegra/hotplug.c
@@ -26,10 +26,10 @@ static inline void cpu_enter_lowpower(void)
 	 * Turn off coherency
 	 */
 	"	mrc	p15, 0, %0, c1, c0, 1\n"
-	"	bic	%0, %0, %2\n"
+	"	bic	%0, %0, #0x20\n"
 	"	mcr	p15, 0, %0, c1, c0, 1\n"
 	"	mrc	p15, 0, %0, c1, c0, 0\n"
-	"	bic	%0, %0, #0x04\n"
+	"	bic	%0, %0, %2\n"
 	"	mcr	p15, 0, %0, c1, c0, 0\n"
 	  : "=&r" (v)
 	  : "r" (0), "Ir" (CR_C)