From 03e5386e1e6e4f19c18c33fb69afd43054d448b2 Mon Sep 17 00:00:00 2001 From: Quinn Jensen Date: Fri, 27 Jul 2007 23:30:55 +0100 Subject: [ARM] 4530/1: MXC: fix elf_hwcap compile breakage as in iop13xx MXC needs the same change as IOP. See [ARM] 4494/1 or commit 7dea1b20066cd30fb54da7e686b16b5e38b46b2d An undefined reference to elf_hwcap prevents linkage, due to changes made by f884b1cf578e079f01682514ae1ae64c74586602 and d1cbbd6b413510c6512f4f80ffd48db1a8dd554a Removing processor.h removes the extern definition of elf_hwcap, which fixes the link issue, but forgets cpu_relax(). So, instead, we'll call barrier() directly. Cc: Lennert Buytenhek Cc: Catalin Marinas Acked-by: Ross Wille Signed-off-by: Quinn Jensen Signed-off-by: Russell King --- include/asm-arm/arch-mxc/uncompress.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'include/asm-arm') diff --git a/include/asm-arm/arch-mxc/uncompress.h b/include/asm-arm/arch-mxc/uncompress.h index ec5787d0e78..42cc0cb3fef 100644 --- a/include/asm-arm/arch-mxc/uncompress.h +++ b/include/asm-arm/arch-mxc/uncompress.h @@ -26,7 +26,6 @@ #define __MXC_BOOT_UNCOMPRESS #include -#include #define UART(x) (*(volatile unsigned long *)(serial_port + (x))) @@ -62,7 +61,7 @@ static void putc(int ch) } while (!(UART(USR2) & USR2_TXFE)) - cpu_relax(); + barrier(); UART(TXR) = ch; } -- cgit v1.2.3