Commit:     7dea1b20066cd30fb54da7e686b16b5e38b46b2d
Parent:     a8135fcfd0431eda3653c7069e7aefc8674fdfbe
Author:     Dan Williams <[EMAIL PROTECTED]>
AuthorDate: Fri Jul 20 02:07:31 2007 +0100
Committer:  Russell King <[EMAIL PROTECTED]>
CommitDate: Fri Jul 20 09:35:35 2007 +0100

    [ARM] 4494/1: iop13xx: fix up elf_hwcap compile breakage
    arch/arm/boot/compressed/misc.o: In function `valid_user_regs':
    misc.c:(.text+0x74): undefined reference to `elf_hwcap'
    This triggers after the various elf_hwcap cleanups in:
    include/asm-arm/arch-iop13xx/uncompress.h calls cpu_relax while spinning on
    a register value.  cpu_relax requires processor.h->ptrace.h->hwcap.h
    'elf_hwcap' is defined as an extern, but since the uncompressor does not
    link against arch/arm/kernel/setup.c 'elf_hwcap' remains undefined.
    Fix is to open code the cpu_relax() call as barrier().
    Cc: Lennert Buytenhek <[EMAIL PROTECTED]>
    Cc: Catalin Marinas <[EMAIL PROTECTED]>
    Signed-off-by: Dan Williams <[EMAIL PROTECTED]>
    Signed-off-by: Russell King <[EMAIL PROTECTED]>
 include/asm-arm/arch-iop13xx/uncompress.h |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/include/asm-arm/arch-iop13xx/uncompress.h 
index b9525d5..dd9c293 100644
--- a/include/asm-arm/arch-iop13xx/uncompress.h
+++ b/include/asm-arm/arch-iop13xx/uncompress.h
@@ -1,7 +1,6 @@
 #include <asm/types.h>
 #include <linux/serial_reg.h>
 #include <asm/hardware.h>
-#include <asm/processor.h>
 #define UART_BASE ((volatile u32 *)IOP13XX_UART1_PHYS)
@@ -9,7 +8,7 @@
 static inline void putc(char c)
        while ((UART_BASE[UART_LSR] & TX_DONE) != TX_DONE)
-               cpu_relax();
+               barrier();
        UART_BASE[UART_TX] = c;
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