diff options
| author | Dave Airlie <airlied@redhat.com> | 2011-10-18 10:54:30 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-10-18 10:54:30 +0100 |
| commit | 017ed8012e74ca15748863f45d2c078453026a0a (patch) | |
| tree | 7071171a06de4e93fc890e0afce5c23596a26619 /arch/arm/mach-exynos4/platsmp.c | |
| parent | 80d9b24a658c83602aea66e45e2347c5bb3cbd47 (diff) | |
| parent | 899e3ee404961a90b828ad527573aaaac39f0ab1 (diff) | |
| download | talos-op-linux-017ed8012e74ca15748863f45d2c078453026a0a.tar.gz talos-op-linux-017ed8012e74ca15748863f45d2c078453026a0a.zip | |
Merge tag 'v3.1-rc10' into drm-core-next
There are a number of fixes in mainline required for code in -next,
also there was a few conflicts I'd rather resolve myself.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Conflicts:
drivers/gpu/drm/radeon/evergreen.c
drivers/gpu/drm/radeon/r600.c
drivers/gpu/drm/radeon/radeon_asic.h
Diffstat (limited to 'arch/arm/mach-exynos4/platsmp.c')
| -rw-r--r-- | arch/arm/mach-exynos4/platsmp.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos4/platsmp.c b/arch/arm/mach-exynos4/platsmp.c index 7c2282c6ba81..df6ef1b2f98b 100644 --- a/arch/arm/mach-exynos4/platsmp.c +++ b/arch/arm/mach-exynos4/platsmp.c @@ -106,6 +106,8 @@ void __cpuinit platform_secondary_init(unsigned int cpu) */ spin_lock(&boot_lock); spin_unlock(&boot_lock); + + set_cpu_online(cpu, true); } int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle) |
