diff --git a/[refs] b/[refs]
index 9cdb34485fc0..5af282b22f2c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8bac83289a061e9b080d500533f29b5822de5b80
+refs/heads/master: 237531714fbe07b27f5b2fbf239df962adfc50d7
diff --git a/trunk/arch/xtensa/platforms/iss/setup.c b/trunk/arch/xtensa/platforms/iss/setup.c
index e7ce16b24441..927acf378ea3 100644
--- a/trunk/arch/xtensa/platforms/iss/setup.c
+++ b/trunk/arch/xtensa/platforms/iss/setup.c
@@ -46,14 +46,14 @@ void platform_pcibios_init(void)
 
 void platform_halt(void)
 {
-	printk (" ** Called platform_halt(), looping forever! **\n");
-	while (1);
+	pr_info(" ** Called platform_halt() **\n");
+	__asm__ __volatile__("movi a2, 1\nsimcall\n");
 }
 
 void platform_power_off(void)
 {
-	printk (" ** Called platform_power_off(), looping forever! **\n");
-	while (1);
+	pr_info(" ** Called platform_power_off() **\n");
+	__asm__ __volatile__("movi a2, 1\nsimcall\n");
 }
 void platform_restart(void)
 {