diff --git a/[refs] b/[refs]
index cf87b0c98247..92b3252f525d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bca7a5a04933700a8bde4ea5798119607a8b0436
+refs/heads/master: 5e45a0a1975df83fc068349e6a31fdf6af61a458
diff --git a/trunk/arch/arm/mach-highbank/hotplug.c b/trunk/arch/arm/mach-highbank/hotplug.c
index 35dd42e21685..a019e4e86e51 100644
--- a/trunk/arch/arm/mach-highbank/hotplug.c
+++ b/trunk/arch/arm/mach-highbank/hotplug.c
@@ -14,6 +14,7 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include <linux/kernel.h>
+#include <asm/cacheflush.h>
 
 #include "core.h"
 #include "sysregs.h"
@@ -27,10 +28,10 @@ extern void secondary_startup(void);
 void __ref highbank_cpu_die(unsigned int cpu)
 {
 	highbank_set_cpu_jump(cpu, phys_to_virt(0));
-	highbank_set_core_pwr();
 
-	cpu_do_idle();
+	flush_cache_louis();
+	highbank_set_core_pwr();
 
-	/* We should never return from idle */
-	panic("highbank: cpu %d unexpectedly exit from shutdown\n", cpu);
+	while (1)
+		cpu_do_idle();
 }