diff options
| author | Gary S. Robertson <gary.robertson@linaro.org> | 2015-10-21 01:59:12 -0500 |
|---|---|---|
| committer | Gary S. Robertson <gary.robertson@linaro.org> | 2015-10-21 01:59:12 -0500 |
| commit | 8797b9d0f050f5d5c5b6ccb9b3c993bc02d6937b (patch) | |
| tree | c6305b31b18ca2f49c1e1b88fec9c920be0252f2 /arch/arm/mach-rockchip/headsmp.S | |
| parent | 48ffd0d5e7b2fb6e7d47344320dbeeaf15d6fd5a (diff) | |
| parent | a143f427f3e7c6d80bc1d288334706a1f8237f5f (diff) | |
Merge tag 'lsk-v4.1-15.09-rt' of http://git.linaro.org/kernel/linux-linaro-stable into linux-linaro-lng-v4.1-rtlinux-lng-preempt-rt-4.1.7-2015.12linux-lng-preempt-rt-4.1.7-2015.11linux-lng-preempt-rt-4.1.7-2015.10
LSK RT 15.09 v4.1
Signed-off-by: Gary S. Robertson <gary.robertson@linaro.org>
Conflicts:
linaro/configs/distribution.conf
Diffstat (limited to 'arch/arm/mach-rockchip/headsmp.S')
| -rw-r--r-- | arch/arm/mach-rockchip/headsmp.S | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/mach-rockchip/headsmp.S b/arch/arm/mach-rockchip/headsmp.S index 46c22dedf632..d69708b07282 100644 --- a/arch/arm/mach-rockchip/headsmp.S +++ b/arch/arm/mach-rockchip/headsmp.S @@ -15,14 +15,6 @@ #include <linux/linkage.h> #include <linux/init.h> -ENTRY(rockchip_secondary_startup) - mrc p15, 0, r0, c0, c0, 0 @ read main ID register - ldr r1, =0x00000c09 @ Cortex-A9 primary part number - teq r0, r1 - beq v7_invalidate_l1 - b secondary_startup -ENDPROC(rockchip_secondary_startup) - ENTRY(rockchip_secondary_trampoline) ldr pc, 1f ENDPROC(rockchip_secondary_trampoline) |