* [PATCH 1/2] pseries: Don't panic when H_PROD fails during cpu-online.
@ 2009-12-10 11:19 Gautham R Shenoy
2009-12-10 11:19 ` [PATCH 2/2] pseries: Make declarations of cpu_hotplug_driver_lock() ANSI compatible Gautham R Shenoy
0 siblings, 1 reply; 2+ messages in thread
From: Gautham R Shenoy @ 2009-12-10 11:19 UTC (permalink / raw)
To: linuxppc-dev; +Cc: Benjamin Herrenschmidt
If an online-attempt on a CPU which has been offlined using H_CEDE
with an appropriate cede latency hint fails, don't panic.
Instead print the error message and let the __cpu_up() code notify the
CPU Hotplug framework of the failure, which in turn can notify the
other subsystem through CPU_UP_CANCELED.
Signed-off-by: Gautham R Shenoy <ego@in•ibm.com>
---
arch/powerpc/platforms/pseries/smp.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/platforms/pseries/smp.c b/arch/powerpc/platforms/pseries/smp.c
index 8868c01..b488663 100644
--- a/arch/powerpc/platforms/pseries/smp.c
+++ b/arch/powerpc/platforms/pseries/smp.c
@@ -144,8 +144,8 @@ static void __devinit smp_pSeries_kick_cpu(int nr)
hcpuid = get_hard_smp_processor_id(nr);
rc = plpar_hcall_norets(H_PROD, hcpuid);
if (rc != H_SUCCESS)
- panic("Error: Prod to wake up processor %d Ret= %ld\n",
- nr, rc);
+ printk(KERN_ERR "Error: Prod to wake up processor %d\
+ Ret= %ld\n", nr, rc);
}
}
^ permalink raw reply related [flat|nested] 2+ messages in thread* [PATCH 2/2] pseries: Make declarations of cpu_hotplug_driver_lock() ANSI compatible.
2009-12-10 11:19 [PATCH 1/2] pseries: Don't panic when H_PROD fails during cpu-online Gautham R Shenoy
@ 2009-12-10 11:19 ` Gautham R Shenoy
0 siblings, 0 replies; 2+ messages in thread
From: Gautham R Shenoy @ 2009-12-10 11:19 UTC (permalink / raw)
To: linuxppc-dev; +Cc: Benjamin Herrenschmidt
And add the __acquires() and __releases() annotations, while at it.
Signed-off-by: Gautham R Shenoy <ego@in•ibm.com>
---
arch/powerpc/platforms/pseries/dlpar.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/platforms/pseries/dlpar.c b/arch/powerpc/platforms/pseries/dlpar.c
index 12df9e8..67b7a10 100644
--- a/arch/powerpc/platforms/pseries/dlpar.c
+++ b/arch/powerpc/platforms/pseries/dlpar.c
@@ -346,12 +346,14 @@ int dlpar_release_drc(u32 drc_index)
static DEFINE_MUTEX(pseries_cpu_hotplug_mutex);
-void cpu_hotplug_driver_lock()
+void cpu_hotplug_driver_lock(void)
+__acquires(pseries_cpu_hotplug_mutex)
{
mutex_lock(&pseries_cpu_hotplug_mutex);
}
-void cpu_hotplug_driver_unlock()
+void cpu_hotplug_driver_unlock(void)
+__releases(pseries_cpu_hotplug_mutex)
{
mutex_unlock(&pseries_cpu_hotplug_mutex);
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-12-10 11:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-12-10 11:19 [PATCH 1/2] pseries: Don't panic when H_PROD fails during cpu-online Gautham R Shenoy
2009-12-10 11:19 ` [PATCH 2/2] pseries: Make declarations of cpu_hotplug_driver_lock() ANSI compatible Gautham R Shenoy
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox