diff options
| author | Olof Johansson <olof@lixom.net> | 2013-01-28 01:07:11 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-28 01:07:20 -0500 |
| commit | 6b914c998787d65022e80d6262dfd0edef58cadb (patch) | |
| tree | ec9d9605ae08e6e40664c4302a181979ab4fe1d3 /arch/arm/plat-versatile | |
| parent | 1f87a404d02a96519284e1928445ca5cfe9667db (diff) | |
| parent | 949db153b6466c6f7cad5a427ecea94985927311 (diff) | |
Merge tag 'v3.8-rc5' into next/cleanup
Linux 3.8-rc5
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/plat-versatile')
| -rw-r--r-- | arch/arm/plat-versatile/headsmp.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-versatile/headsmp.S b/arch/arm/plat-versatile/headsmp.S index dd703ef09b8d..b178d44e9eaa 100644 --- a/arch/arm/plat-versatile/headsmp.S +++ b/arch/arm/plat-versatile/headsmp.S | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | */ | 20 | */ |
| 21 | ENTRY(versatile_secondary_startup) | 21 | ENTRY(versatile_secondary_startup) |
| 22 | mrc p15, 0, r0, c0, c0, 5 | 22 | mrc p15, 0, r0, c0, c0, 5 |
| 23 | and r0, r0, #15 | 23 | bic r0, #0xff000000 |
| 24 | adr r4, 1f | 24 | adr r4, 1f |
| 25 | ldmia r4, {r5, r6} | 25 | ldmia r4, {r5, r6} |
| 26 | sub r4, r4, r5 | 26 | sub r4, r4, r5 |