iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branches 'alignment', 'fixes', 'l2c' (early part) and 'misc' into for-next

Browse Source
This commit is contained in:
Russell King
2014-06-05 12:35:52 +01:00
parent 20e7e36433 3f8517e793 8ef418c717 1c2f87c225
commit 1fb333489f
135 changed files with 2173 additions and 1546 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/kernel/head.S
View File

@ -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?