1 files changed, 11 insertions, 8 deletions

diff --git a/arch/m32r/boot/compressed/m32r_sio.c b/arch/m32r/boot/compressed/m32r_sio.c
index bad5475eff90..8f9a57271f83 100644
--- a/arch/m32r/boot/compressed/m32r_sio.c
+++ b/arch/m32r/boot/compressed/m32r_sio.c
@@ -6,6 +6,7 @@
  */
 
 #include <linux/config.h>
+#include <asm/processor.h>
 
 static void putc(char c);
 
@@ -38,16 +39,17 @@ static int puts(const char *s)
 
 static void putc(char c)
 {
-
-        while ((*BOOT_SIO0STS & 0x3) != 0x3) ;
+        while ((*BOOT_SIO0STS & 0x3) != 0x3)
+                cpu_relax();
         if (c == '\n') {
                 *BOOT_SIO0TXB = '\r';
-                while ((*BOOT_SIO0STS & 0x3) != 0x3) ;
+                while ((*BOOT_SIO0STS & 0x3) != 0x3)
+                        cpu_relax();
         }
         *BOOT_SIO0TXB = c;
 }
-#else /* defined(CONFIG_PLAT_M32700UT_Alpha) || defined(CONFIG_PLAT_M32700UT) */
-#ifdef CONFIG_MMU
+#else /* !(CONFIG_PLAT_M32700UT_Alpha) && !(CONFIG_PLAT_M32700UT) */
+#if defined(CONFIG_PLAT_MAPPI2)
 #define SIO0STS (volatile unsigned short *)(0xa0efd000 + 14)
 #define SIO0TXB (volatile unsigned short *)(0xa0efd000 + 30)
 #else
@@ -57,11 +59,12 @@ static void putc(char c)
 
 static void putc(char c)
 {
-
-        while ((*SIO0STS & 0x1) == 0) ;
+        while ((*SIO0STS & 0x1) == 0)
+                cpu_relax();
         if (c == '\n') {
                 *SIO0TXB = '\r';
-                while ((*SIO0STS & 0x1) == 0) ;
+                while ((*SIO0STS & 0x1) == 0)
+                        cpu_relax();
         }
         *SIO0TXB = c;
 }