summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuinn Jensen <qcjensen@gmail.com>2007-07-27 23:30:55 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2007-07-28 20:52:55 +0100
commit03e5386e1e6e4f19c18c33fb69afd43054d448b2 (patch)
tree99bdc8bad588b8961629a74459ff1aa24cabfb7d
parentcc46f659705c722ae6020dd7411c4ac39cec4408 (diff)
downloadop-kernel-dev-03e5386e1e6e4f19c18c33fb69afd43054d448b2.zip
op-kernel-dev-03e5386e1e6e4f19c18c33fb69afd43054d448b2.tar.gz
[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 <kernel@wantstofly.org> Cc: Catalin Marinas <catalin.marinas@arm.com> Acked-by: Ross Wille <wille@freescale.com> Signed-off-by: Quinn Jensen <quinn.jensen@freescale.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--include/asm-arm/arch-mxc/uncompress.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/asm-arm/arch-mxc/uncompress.h b/include/asm-arm/arch-mxc/uncompress.h
index ec5787d..42cc0cb 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 <asm/hardware.h>
-#include <asm/processor.h>
#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;
}
OpenPOWER on IntegriCloud