diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-06 19:58:33 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-06 19:58:33 -0500 |
| commit | ec773e99ab4abce07b1ae23117179c2861831964 (patch) | |
| tree | 630de8df04406f7de326349169d9a61e51864c99 /arch/arm/mach-exynos | |
| parent | 534baf55dd16d5de9c8d045190469eef9d31ffff (diff) | |
| parent | 7a3f8de5a3c36e5fde130cae74a06663b59837ae (diff) | |
Merge branch 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
* 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm:
ARM: PXA: fix includes in pxa2xx_cm_x2xx PCMCIA driver
ARM: PXA: fix gpio-pxa.h build errors
ARM: 7142/1: davinci: mark GPIO implementation complex
ARM: 7134/1: Revert "EXYNOS4: Fix routing timer interrupt to offline CPU"
ARM: PXA: eseries: fix eseries_register_clks section mismatch warning
ARM: PXA: fix lubbock PCMCIA driver build error
Diffstat (limited to 'arch/arm/mach-exynos')
| -rw-r--r-- | arch/arm/mach-exynos/platsmp.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-exynos/platsmp.c b/arch/arm/mach-exynos/platsmp.c index 05595407e9f..69ffb2fb387 100644 --- a/arch/arm/mach-exynos/platsmp.c +++ b/arch/arm/mach-exynos/platsmp.c | |||
| @@ -110,8 +110,6 @@ void __cpuinit platform_secondary_init(unsigned int cpu) | |||
| 110 | */ | 110 | */ |
| 111 | spin_lock(&boot_lock); | 111 | spin_lock(&boot_lock); |
| 112 | spin_unlock(&boot_lock); | 112 | spin_unlock(&boot_lock); |
| 113 | |||
| 114 | set_cpu_online(cpu, true); | ||
| 115 | } | 113 | } |
| 116 | 114 | ||
| 117 | int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle) | 115 | int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle) |