diff options
| author | Michael Ellerman <michael@ozlabs.org> | 2011-04-11 21:46:19 +0000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-04-20 17:01:18 +1000 |
| commit | de300974761d92f71cb583730ac9e1d4eb1b7156 (patch) | |
| tree | bfce8daf1dec8dff5af215bcf7647f38632490d4 /arch/powerpc/platforms/iseries | |
| parent | 6c5b59b913874cae535a324a671b7ed4f17e6397 (diff) | |
| download | kernel_goldelico_gta04-de300974761d92f71cb583730ac9e1d4eb1b7156.zip kernel_goldelico_gta04-de300974761d92f71cb583730ac9e1d4eb1b7156.tar.gz kernel_goldelico_gta04-de300974761d92f71cb583730ac9e1d4eb1b7156.tar.bz2 | |
powerpc/smp: smp_ops->kick_cpu() should be able to fail
When we start a cpu we use smp_ops->kick_cpu(), which currently
returns void, it should be able to fail. Convert it to return
int, and update all uses.
Convert all the current error cases to return -ENOENT, which is
what would eventually be returned by __cpu_up() currently when
it doesn't detect the cpu as coming up in time.
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/platforms/iseries')
| -rw-r--r-- | arch/powerpc/platforms/iseries/smp.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/iseries/smp.c b/arch/powerpc/platforms/iseries/smp.c index 6c60299..02a677a 100644 --- a/arch/powerpc/platforms/iseries/smp.c +++ b/arch/powerpc/platforms/iseries/smp.c @@ -86,13 +86,13 @@ static int smp_iSeries_probe(void) return cpumask_weight(cpu_possible_mask); } -static void smp_iSeries_kick_cpu(int nr) +static int smp_iSeries_kick_cpu(int nr) { BUG_ON((nr < 0) || (nr >= NR_CPUS)); /* Verify that our partition has a processor nr */ if (lppaca_of(nr).dyn_proc_status >= 2) - return; + return -ENOENT; /* The processor is currently spinning, waiting * for the cpu_start field to become non-zero @@ -100,6 +100,8 @@ static void smp_iSeries_kick_cpu(int nr) * continue on to secondary_start in iSeries_head.S */ paca[nr].cpu_start = 1; + + return 0; } static void __devinit smp_iSeries_setup_cpu(int nr) |