From 3920f1f5e6af82521f9ab7db9faf208a9c313763 Mon Sep 17 00:00:00 2001 From: Rabin Vincent Date: Thu, 29 Jul 2010 12:13:18 +0100 Subject: [PATCH] --- yaml --- r: 201380 b: refs/heads/master c: 661f10f6b6ce55c737e88c4803453eba4ba3a61c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-ux500/include/mach/uncompress.h | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 3e5835c46f97..80cbd55ff744 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f1b957d3a06826f4a30fd4440e54a6b87c2e6173 +refs/heads/master: 661f10f6b6ce55c737e88c4803453eba4ba3a61c diff --git a/trunk/arch/arm/mach-ux500/include/mach/uncompress.h b/trunk/arch/arm/mach-ux500/include/mach/uncompress.h index 8552eb188b50..0271ca0a83df 100644 --- a/trunk/arch/arm/mach-ux500/include/mach/uncompress.h +++ b/trunk/arch/arm/mach-ux500/include/mach/uncompress.h @@ -30,22 +30,22 @@ static void putc(const char c) { /* Do nothing if the UART is not enabled. */ - if (!(readb(U8500_UART_CR) & 0x1)) + if (!(__raw_readb(U8500_UART_CR) & 0x1)) return; if (c == '\n') putc('\r'); - while (readb(U8500_UART_FR) & (1 << 5)) + while (__raw_readb(U8500_UART_FR) & (1 << 5)) barrier(); - writeb(c, U8500_UART_DR); + __raw_writeb(c, U8500_UART_DR); } static void flush(void) { - if (!(readb(U8500_UART_CR) & 0x1)) + if (!(__raw_readb(U8500_UART_CR) & 0x1)) return; - while (readb(U8500_UART_FR) & (1 << 3)) + while (__raw_readb(U8500_UART_FR) & (1 << 3)) barrier(); }