lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'smp' into misc

Browse Source 
Conflicts:
	arch/arm/kernel/entry-armv.S
	arch/arm/mm/ioremap.c
This commit is contained in:
Russell King
2011-01-06 22:31:35 +00:00
parent 24056f5250 15095bb0fe
commit 4ec3eb1363
1391 changed files with 25607 additions and 12357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/include/asm/entry-macro-multi.S
View File

@@ -20,7 +20,7 @@
*/
ALT_SMP(test_for_ipi r0, r6, r5, lr)
ALT_UP_B(9997f)
movne r0, sp
movne r1, sp
adrne lr, BSYM(1b)
bne do_IPI