summaryrefslogtreecommitdiff
path: root/arch/powerpc/platforms/pseries/kexec.c
diff options
context:
space:
mode:
authorAnton Blanchard <anton@samba.org>2011-07-25 05:46:33 +0400
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-08-05 08:47:57 +0400
commit711ef84e80ec6f937ad59c7a00490421a5c92867 (patch)
tree7a162ea45846138eafc28862e6b1caa2f5c934a5 /arch/powerpc/platforms/pseries/kexec.c
parentb1301797f30370c430244979671978fc232f4533 (diff)
downloadlinux-711ef84e80ec6f937ad59c7a00490421a5c92867.tar.xz
powerpc/pseries: Cleanup VPA registration and deregistration errors
Make the VPA, SLB shadow and DTL registration and deregistration functions print consistent messages on error. I needed the firmware error code while chasing a kexec bug but we weren't printing it. Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/platforms/pseries/kexec.c')
-rw-r--r--arch/powerpc/platforms/pseries/kexec.c19
1 files changed, 11 insertions, 8 deletions
diff --git a/arch/powerpc/platforms/pseries/kexec.c b/arch/powerpc/platforms/pseries/kexec.c
index 1118cb79f9e3..3bae8bd7db3b 100644
--- a/arch/powerpc/platforms/pseries/kexec.c
+++ b/arch/powerpc/platforms/pseries/kexec.c
@@ -39,17 +39,20 @@ static void pseries_kexec_cpu_down(int crash_shutdown, int secondary)
}
addr = __pa(get_slb_shadow());
- if (unregister_slb_shadow(hard_smp_processor_id(), addr))
- printk("SLB shadow buffer deregistration of "
- "cpu %u (hw_cpu_id %d) failed\n",
+ ret = unregister_slb_shadow(hard_smp_processor_id(), addr);
+ if (ret) {
+ pr_err("WARNING: SLB shadow buffer deregistration "
+ "for cpu %d (hw %d) failed with %d\n",
smp_processor_id(),
- hard_smp_processor_id());
+ hard_smp_processor_id(), ret);
+ }
addr = __pa(get_lppaca());
- if (unregister_vpa(hard_smp_processor_id(), addr)) {
- printk("VPA deregistration of cpu %u (hw_cpu_id %d) "
- "failed\n", smp_processor_id(),
- hard_smp_processor_id());
+ ret = unregister_vpa(hard_smp_processor_id(), addr);
+ if (ret) {
+ pr_err("WARNING: VPA deregistration for cpu %d "
+ "(hw %d) failed with %d\n", smp_processor_id(),
+ hard_smp_processor_id(), ret);
}
}
}