Commit:     03e5386e1e6e4f19c18c33fb69afd43054d448b2
Parent:     cc46f659705c722ae6020dd7411c4ac39cec4408
Author:     Quinn Jensen <[EMAIL PROTECTED]>
AuthorDate: Fri Jul 27 23:30:55 2007 +0100
Committer:  Russell King <[EMAIL PROTECTED]>
CommitDate: Sat Jul 28 20:52:55 2007 +0100

    [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 <[EMAIL PROTECTED]>
    Cc: Catalin Marinas <[EMAIL PROTECTED]>
    Acked-by: Ross Wille <[EMAIL PROTECTED]>
    Signed-off-by: Quinn Jensen <[EMAIL PROTECTED]>
    Signed-off-by: Russell King <[EMAIL PROTECTED]>
 include/asm-arm/arch-mxc/uncompress.h |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/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 @@
 #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;
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to