From 2ab58a8236555032d6733ff314744efdd07e83e8 Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Mon, 26 Apr 2010 18:39:50 +0900 Subject: [PATCH] --- yaml --- r: 191638 b: refs/heads/master c: f0ccf2770f523bd4fc436886a38e499f9ec95c0e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/sh/kernel/idle.c | 2 +- trunk/arch/sh/kernel/smp.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a385be62d7ea..e0326b8efd0e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c9f4a3f53b5d61f86eae3512abdf948878ca3498 +refs/heads/master: f0ccf2770f523bd4fc436886a38e499f9ec95c0e diff --git a/trunk/arch/sh/kernel/idle.c b/trunk/arch/sh/kernel/idle.c index 273f890b17ae..204005329fe1 100644 --- a/trunk/arch/sh/kernel/idle.c +++ b/trunk/arch/sh/kernel/idle.c @@ -133,7 +133,7 @@ static void do_nothing(void *unused) void stop_this_cpu(void *unused) { local_irq_disable(); - cpu_clear(smp_processor_id(), cpu_online_map); + set_cpu_online(smp_processor_id(), false); for (;;) cpu_sleep(); diff --git a/trunk/arch/sh/kernel/smp.c b/trunk/arch/sh/kernel/smp.c index 2f348fda0159..cc87830ace7f 100644 --- a/trunk/arch/sh/kernel/smp.c +++ b/trunk/arch/sh/kernel/smp.c @@ -102,7 +102,7 @@ asmlinkage void __cpuinit start_secondary(void) smp_store_cpu_info(cpu); - cpu_set(cpu, cpu_online_map); + set_cpu_online(cpu, true); cpu_idle(); }