Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 661f10f6 authored by Rabin Vincent's avatar Rabin Vincent Committed by Russell King
Browse files

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: default avatarLinus Walleij <linus.walleij@stericsson.com>
Signed-off-by: default avatarRabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent f1b957d3

arch/arm/mach-ux500/include/mach/uncompress.h

+5 −5
Original line number Diff line number Diff line
@@ -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();

}