aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorUwe Zeisberger <Uwe_Zeisberger@digi.com>2006-05-02 20:40:56 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-05-02 20:40:56 +0100
commitb2556da55f78a9dbe92830b1d1c0b612edfea9fd (patch)
tree18487bb34291fa5d754ea90b98af86d7b205c057 /arch/arm/boot
parent76bbb00288e569e7bd9ec18f45e4f814352260dd (diff)
downloadkernel_samsung_tuna-b2556da55f78a9dbe92830b1d1c0b612edfea9fd.zip
kernel_samsung_tuna-b2556da55f78a9dbe92830b1d1c0b612edfea9fd.tar.gz
kernel_samsung_tuna-b2556da55f78a9dbe92830b1d1c0b612edfea9fd.tar.bz2
[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>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/compressed/misc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/compressed/misc.c b/arch/arm/boot/compressed/misc.c
index 0af3772..ace3fb58 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)