Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 03e5386e1e6e4f19c18c33fb69afd43054d448b2

Authored by Quinn Jensen
Committed by Russell King
1 parent cc46f65970

[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>

Showing 1 changed file with 1 additions and 2 deletions Side-by-side Diff

include/asm-arm/arch-mxc/uncompress.h
Diff comments   View file @ 03e5386
... ... @@ -26,7 +26,6 @@
26 26 #define __MXC_BOOT_UNCOMPRESS
27 27  
28 28 #include <asm/hardware.h>
29   -#include <asm/processor.h>
30 29  
31 30 #define UART(x) (*(volatile unsigned long *)(serial_port + (x)))
32 31  
... ... @@ -62,7 +61,7 @@
62 61 }
63 62  
64 63 while (!(UART(USR2) & USR2_TXFE))
65   - cpu_relax();
  64 + barrier();
66 65  
67 66 UART(TXR) = ch;
68 67 }