git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'alignment', 'fixes', 'l2c' (early part) and 'misc' into for-next
[pandora-kernel.git]
/
arch
/
arm
/
kernel
/
head.S
diff --git
a/arch/arm/kernel/head.S
b/arch/arm/kernel/head.S
index
591d6e4
..
2c35f0f
100644
(file)
--- a/
arch/arm/kernel/head.S
+++ b/
arch/arm/kernel/head.S
@@
-475,7
+475,7
@@
ENDPROC(__turn_mmu_on)
#ifdef CONFIG_SMP_ON_UP
- __
INIT
+ __
HEAD
__fixup_smp:
and r3, r9, #0x000f0000 @ architecture version
teq r3, #0x000f0000 @ CPU ID supported?