diff options
| author | srinidhi kasagar <srinidhi.kasagar@stericsson.com> | 2011-09-23 17:39:57 +0530 |
|---|---|---|
| committer | Jonas ABERG <jonas.aberg@stericsson.com> | 2011-09-23 16:09:51 +0200 |
| commit | fa25539335d87abc0e6667f23d3d67af2c15c71a (patch) | |
| tree | 2749ecc55caa22be73360e7cef2866c9b90a6920 /arch/arm/mach-ux500/headsmp.S | |
| parent | 7fbb06612c0f054ae4689deeab8d2b37d3144f94 (diff) | |
mach-ux500: revert the wrong merge of headsmp.S
The commit 8a95c3f51896af123cd160880e70be4cda30d1bc
"
Author: Philippe Langlais <philippe.langlais@linaro.org>
Date: Tue Apr 12 12:53:13 2011 +0200
mach-ux500: full alignment with 2.6.35
"
reverts the mainline commit 78368c79944b12f91bcacb0b0b030c36016264e8
which is wrong. Fix it to align with mainline code
ST-Ericsson ID: -
ST-Ericsson Linux next: -
ST-Ericsson FOSS-OUT ID: -
Signed-off-by: srinidhi kasagar <srinidhi.kasagar@stericsson.com>
Change-Id: I8be9a030e8a827ebb9da7c298c7c291dab160ef7
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/31872
Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
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 a6be2cdf2b2..64fa451edcf 100644 --- a/arch/arm/mach-ux500/headsmp.S +++ b/arch/arm/mach-ux500/headsmp.S @@ -23,7 +23,6 @@ ENTRY(u8500_secondary_startup) ldmia r4, {r5, r6} sub r4, r4, r5 add r6, r6, r4 - dsb pen: ldr r7, [r6] cmp r7, r0 bne pen |