提交 661f10f6 编写于 作者: R Rabin Vincent 提交者: Russell King

ARM: 6275/1: ux500: don't use writeb() in uncompress.h

Don't use writeb() in uncompress.h, to avoid the following build errors
when the "Add barriers to the I/O accessors" series is applied.  Use
__raw_writeb() instead.

arch/arm/boot/compressed/misc.o: In function `putc':
arch/arm/mach-ux500/include/mach/uncompress.h:41:
undefined reference to `outer_cache'
Acked-by: NLinus Walleij <linus.walleij@stericsson.com>
Signed-off-by: NRabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
上级 f1b957d3
...@@ -30,22 +30,22 @@ ...@@ -30,22 +30,22 @@
static void putc(const char c) static void putc(const char c)
{ {
/* Do nothing if the UART is not enabled. */ /* Do nothing if the UART is not enabled. */
if (!(readb(U8500_UART_CR) & 0x1)) if (!(__raw_readb(U8500_UART_CR) & 0x1))
return; return;
if (c == '\n') if (c == '\n')
putc('\r'); putc('\r');
while (readb(U8500_UART_FR) & (1 << 5)) while (__raw_readb(U8500_UART_FR) & (1 << 5))
barrier(); barrier();
writeb(c, U8500_UART_DR); __raw_writeb(c, U8500_UART_DR);
} }
static void flush(void) static void flush(void)
{ {
if (!(readb(U8500_UART_CR) & 0x1)) if (!(__raw_readb(U8500_UART_CR) & 0x1))
return; return;
while (readb(U8500_UART_FR) & (1 << 3)) while (__raw_readb(U8500_UART_FR) & (1 << 3))
barrier(); barrier();
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册