From: Uwe Zeisberger <Uwe_Zeisberger@digi.com>
Date: Tue, 2 May 2006 19:40:56 +0000 (+0100)
Subject: [ARM] 3488/1: make icedcc_putc do the right thing
X-Git-Tag: v2.6.17-rc4~42^2~1
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b2556da55f78a9dbe92830b1d1c0b612edfea9fd;p=linux-2.6-omap-h63xx.git

[ARM] 3488/1: make icedcc_putc do the right thing

Patch from Uwe Zeisberger

 a) use coprocessor 14
 b) make reading the dcc status volatile

Signed-off-by: Uwe Zeisberger <Uwe_Zeisberger@digi.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/arch/arm/boot/compressed/misc.c b/arch/arm/boot/compressed/misc.c
index 0af3772efcb..ace3fb5835d 100644
--- a/arch/arm/boot/compressed/misc.c
+++ b/arch/arm/boot/compressed/misc.c
@@ -38,10 +38,10 @@ static void icedcc_putc(int ch)
 		if (--i < 0)
 			return;
 
-		asm("mrc p14, 0, %0, c0, c0, 0" : "=r" (status));
+		asm volatile ("mrc p14, 0, %0, c0, c0, 0" : "=r" (status));
 	} while (status & 2);
 
-	asm("mcr p15, 0, %0, c1, c0, 0" : : "r" (ch));
+	asm("mcr p14, 0, %0, c1, c0, 0" : : "r" (ch));
 }
 
 #define putc(ch)	icedcc_putc(ch)