diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 17:31:35 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 17:32:03 -0500 |
| commit | 4ec3eb13634529c0bc7466658d84d0bbe3244aea (patch) | |
| tree | b491daac2ccfc7b8ca88e171a43f66888463568a /arch/arm/mach-ux500/headsmp.S | |
| parent | 24056f525051a9e186af28904b396320e18bf9a0 (diff) | |
| parent | 15095bb0fe779c0403091bda7adce5fb3bb9ca35 (diff) | |
Merge branch 'smp' into misc
Conflicts:
arch/arm/kernel/entry-armv.S
arch/arm/mm/ioremap.c
Diffstat (limited to 'arch/arm/mach-ux500/headsmp.S')
| -rw-r--r-- | arch/arm/mach-ux500/headsmp.S | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/headsmp.S b/arch/arm/mach-ux500/headsmp.S index a6be2cdf2b2f..64fa451edcfd 100644 --- a/arch/arm/mach-ux500/headsmp.S +++ b/arch/arm/mach-ux500/headsmp.S | |||
| @@ -23,7 +23,6 @@ ENTRY(u8500_secondary_startup) | |||
| 23 | ldmia r4, {r5, r6} | 23 | ldmia r4, {r5, r6} |
| 24 | sub r4, r4, r5 | 24 | sub r4, r4, r5 |
| 25 | add r6, r6, r4 | 25 | add r6, r6, r4 |
| 26 | dsb | ||
| 27 | pen: ldr r7, [r6] | 26 | pen: ldr r7, [r6] |
| 28 | cmp r7, r0 | 27 | cmp r7, r0 |
| 29 | bne pen | 28 | bne pen |