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 branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[pandora-kernel.git]
/
arch
/
arm
/
plat-versatile
/
headsmp.S
diff --git
a/arch/arm/plat-versatile/headsmp.S
b/arch/arm/plat-versatile/headsmp.S
index
dd703ef
..
b178d44
100644
(file)
--- a/
arch/arm/plat-versatile/headsmp.S
+++ b/
arch/arm/plat-versatile/headsmp.S
@@
-20,7
+20,7
@@
*/
ENTRY(versatile_secondary_startup)
mrc p15, 0, r0, c0, c0, 5
- and r0, r0, #15
+ bic r0, #0xff000000
adr r4, 1f
ldmia r4, {r5, r6}
sub r4, r4, r5