git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
powerpc/smp: smp_ops->kick_cpu() should be able to fail
[pandora-kernel.git]
/
arch
/
powerpc
/
platforms
/
86xx
/
mpc86xx_smp.c
diff --git
a/arch/powerpc/platforms/86xx/mpc86xx_smp.c
b/arch/powerpc/platforms/86xx/mpc86xx_smp.c
index
eacea0e
..
af09bae
100644
(file)
--- a/
arch/powerpc/platforms/86xx/mpc86xx_smp.c
+++ b/
arch/powerpc/platforms/86xx/mpc86xx_smp.c
@@
-56,7
+56,7
@@
smp_86xx_release_core(int nr)
}
}
-static
void
__init
+static
int
__init
smp_86xx_kick_cpu(int nr)
{
unsigned int save_vector;
smp_86xx_kick_cpu(int nr)
{
unsigned int save_vector;
@@
-65,7
+65,7
@@
smp_86xx_kick_cpu(int nr)
unsigned int *vector = (unsigned int *)(KERNELBASE + 0x100);
if (nr < 0 || nr >= NR_CPUS)
unsigned int *vector = (unsigned int *)(KERNELBASE + 0x100);
if (nr < 0 || nr >= NR_CPUS)
- return;
+ return
-ENOENT
;
pr_debug("smp_86xx_kick_cpu: kick CPU #%d\n", nr);
pr_debug("smp_86xx_kick_cpu: kick CPU #%d\n", nr);
@@
-92,6
+92,8
@@
smp_86xx_kick_cpu(int nr)
local_irq_restore(flags);
pr_debug("wait CPU #%d for %d msecs.\n", nr, n);
local_irq_restore(flags);
pr_debug("wait CPU #%d for %d msecs.\n", nr, n);
+
+ return 0;
}
}