pseries: Don't panic when H_PROD fails during cpu-online.
PATCH 1/2 pseries: Don't panic when H_PROD fails during cpu-online.
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 <[email protected]>
--- arch/powerpc/platforms/pseries/smp.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
arch/powerpc/platforms/pseries/smp.c +2 -2
@@ -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); } }
PATCH 2/2 pseries: Make declarations of cpu_hotplug_driver_lock() ANSI compatible.
And add the __acquires() and __releases() annotations, while at it.
Signed-off-by Gautham R Shenoy <[email protected]>
--- arch/powerpc/platforms/pseries/dlpar.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
arch/powerpc/platforms/pseries/dlpar.c +4 -2
@@ -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); }