aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/boot/compressed/head-shark.S
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-06-09 17:15:56 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-06-09 17:15:56 -0700
commit0b52a3c89c8f44d7a936da8b374789dc0f43b188 (patch)
treee43d677f78037bbf063f9c07de7b32dfa0bf87f6 /arch/arm/boot/compressed/head-shark.S
parent6dbda5bfe16bbb18af3ab249974daab9143be77f (diff)
parent509eb76ebf9771abc9fe51859382df2571f11447 (diff)
downloadvexpress-lsk-0b52a3c89c8f44d7a936da8b374789dc0f43b188.tar.gz
Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm
Pull ARM fixes from Russell King: "The biggest two fixes are fixing a compilation error with the decompressor, and a problem with our __my_cpu_offset implementation. Other changes are very trivial and small, which seems to be the way for most -rc stuff." * 'fixes' of git://git.linaro.org/people/rmk/linux-arm: ARM: 7747/1: pcpu: ensure __my_cpu_offset cannot be re-ordered across barrier() ARM: 7750/1: update legacy CPU ID in decompressor cache support jump table ARM: 7743/1: compressed/head.S: work around new binutils warning ARM: 7742/1: topology: export cpu_topology ARM: 7737/1: fix kernel decompressor compilation error with CONFIG_DEBUG_SEMIHOSTING
Diffstat (limited to 'arch/arm/boot/compressed/head-shark.S')
-rw-r--r--arch/arm/boot/compressed/head-shark.S1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/compressed/head-shark.S b/arch/arm/boot/compressed/head-shark.S
index 089c560e07f..92b56897ed6 100644
--- a/arch/arm/boot/compressed/head-shark.S
+++ b/arch/arm/boot/compressed/head-shark.S
@@ -18,6 +18,7 @@
.section ".start", "ax"
+ .arch armv4
b __beginning
__ofw_data: .long 0 @ the number of memory blocks