From 204ef9b89e069a772d6f077e42213d260fe96840 Mon Sep 17 00:00:00 2001
From: Nick Bowler <nbowler@elliptictech.com>
Date: Wed, 24 Aug 2011 18:55:37 +0100
Subject: [PATCH] --- yaml --- r: 264630 b: refs/heads/master c:
 b3377d1865723cea5334954e6ffcb2182b6689c8 h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/arm/mach-vexpress/hotplug.c | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 558d1a08d1c9..8bbc22e0d6c6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ef4c53687e0adf5409896c4fa688b15f8d4dc0c0
+refs/heads/master: b3377d1865723cea5334954e6ffcb2182b6689c8
diff --git a/trunk/arch/arm/mach-vexpress/hotplug.c b/trunk/arch/arm/mach-vexpress/hotplug.c
index ea4cbfb90a66..3668cf91d2de 100644
--- a/trunk/arch/arm/mach-vexpress/hotplug.c
+++ b/trunk/arch/arm/mach-vexpress/hotplug.c
@@ -13,6 +13,7 @@
 #include <linux/smp.h>
 
 #include <asm/cacheflush.h>
+#include <asm/system.h>
 
 extern volatile int pen_release;
 
@@ -62,13 +63,7 @@ static inline void platform_do_lowpower(unsigned int cpu, int *spurious)
 	 * code will have already disabled interrupts
 	 */
 	for (;;) {
-		/*
-		 * here's the WFI
-		 */
-		asm(".word	0xe320f003\n"
-		    :
-		    :
-		    : "memory", "cc");
+		wfi();
 
 		if (pen_release == cpu) {
 			/*