提交 f8d0d5dc 编写于 作者: S Santosh Sivaraj 提交者: Michael Ellerman

powerpc/smp: Do not BUG_ON if invalid CPU during kick

During secondary start, we do not need to BUG_ON if an invalid CPU number
is passed. We already print an error if secondary cannot be started, so
just return an error instead.
Signed-off-by: NSantosh Sivaraj <santosh@fossix.org>
Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
上级 adeb8667
...@@ -112,7 +112,8 @@ int smp_generic_cpu_bootable(unsigned int nr) ...@@ -112,7 +112,8 @@ int smp_generic_cpu_bootable(unsigned int nr)
#ifdef CONFIG_PPC64 #ifdef CONFIG_PPC64
int smp_generic_kick_cpu(int nr) int smp_generic_kick_cpu(int nr)
{ {
BUG_ON(nr < 0 || nr >= NR_CPUS); if (nr < 0 || nr >= NR_CPUS)
return -EINVAL;
/* /*
* The processor is currently spinning, waiting for the * The processor is currently spinning, waiting for the
......
...@@ -115,7 +115,8 @@ static void smp_cell_setup_cpu(int cpu) ...@@ -115,7 +115,8 @@ static void smp_cell_setup_cpu(int cpu)
static int smp_cell_kick_cpu(int nr) static int smp_cell_kick_cpu(int nr)
{ {
BUG_ON(nr < 0 || nr >= NR_CPUS); if (nr < 0 || nr >= NR_CPUS)
return -EINVAL;
if (!smp_startup_cpu(nr)) if (!smp_startup_cpu(nr))
return -ENOENT; return -ENOENT;
......
...@@ -63,7 +63,8 @@ static int pnv_smp_kick_cpu(int nr) ...@@ -63,7 +63,8 @@ static int pnv_smp_kick_cpu(int nr)
long rc; long rc;
uint8_t status; uint8_t status;
BUG_ON(nr < 0 || nr >= NR_CPUS); if (nr < 0 || nr >= NR_CPUS)
return -EINVAL;
/* /*
* If we already started or OPAL is not supported, we just * If we already started or OPAL is not supported, we just
......
...@@ -151,7 +151,8 @@ static void smp_setup_cpu(int cpu) ...@@ -151,7 +151,8 @@ static void smp_setup_cpu(int cpu)
static int smp_pSeries_kick_cpu(int nr) static int smp_pSeries_kick_cpu(int nr)
{ {
BUG_ON(nr < 0 || nr >= NR_CPUS); if (nr < 0 || nr >= NR_CPUS)
return -EINVAL;
if (!smp_startup_cpu(nr)) if (!smp_startup_cpu(nr))
return -ENOENT; return -ENOENT;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册