| commit | 4ec3eb13634529c0bc7466658d84d0bbe3244aea | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk+kernel@arm.linux.org.uk> | Thu Jan 06 22:31:35 2011 +0000 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Thu Jan 06 22:32:03 2011 +0000 |
| tree | b491daac2ccfc7b8ca88e171a43f66888463568a | |
| parent | 24056f525051a9e186af28904b396320e18bf9a0 [diff] [blame] | |
| parent | 15095bb0fe779c0403091bda7adce5fb3bb9ca35 [diff] [blame] |
Merge branch 'smp' into misc Conflicts: arch/arm/kernel/entry-armv.S arch/arm/mm/ioremap.c
diff --git a/arch/arm/include/asm/entry-macro-multi.S b/arch/arm/include/asm/entry-macro-multi.S index 44f21d4..ec0bbf7 100644 --- a/arch/arm/include/asm/entry-macro-multi.S +++ b/arch/arm/include/asm/entry-macro-multi.S
@@ -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