aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc C <marc.ceeeee@gmail.com>2013-06-05 17:02:23 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-06-05 18:32:40 -0400
commitced2a3b84965f1be8b6a142d6029faf241f109af (patch)
tree9b8ae1675dc2092d0b49ab6248c66a4ad42d2917
parentda94a829305f1c217cfdf6771cb1faca0917e3b9 (diff)
ARM: 7750/1: update legacy CPU ID in decompressor cache support jump table
The previous mask values for the legacy ARM CPU IDs were conflicting with the CPU ID assignments for late-generation CPUs (like the Qualcomm MSM/QSD or Broadcom Brahma-15 processors). This change corrects the legacy ARM CPU ID value so that the jump table can fall-through to the appropriate cache maintenance / MMU functions. Signed-off-by: Marc C <marc.ceeeee@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/boot/compressed/head.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
index 693855995407..032a8d987148 100644
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
@@ -806,8 +806,8 @@ call_cache_fn: adr r12, proc_types
806 .align 2 806 .align 2
807 .type proc_types,#object 807 .type proc_types,#object
808proc_types: 808proc_types:
809 .word 0x00000000 @ old ARM ID 809 .word 0x41000000 @ old ARM ID
810 .word 0x0000f000 810 .word 0xff00f000
811 mov pc, lr 811 mov pc, lr
812 THUMB( nop ) 812 THUMB( nop )
813 mov pc, lr 813 mov pc, lr