1 files changed, 22 insertions, 12 deletions

diff --git a/arch/powerpc/platforms/pseries/kexec.c b/arch/powerpc/platforms/pseries/kexec.c
index 54cf3a4aa16b..7d94bdc63d50 100644
--- a/arch/powerpc/platforms/pseries/kexec.c
+++ b/arch/powerpc/platforms/pseries/kexec.c
@@ -25,20 +25,30 @@ static void pseries_kexec_cpu_down(int crash_shutdown, int secondary)
 {
         /* Don't risk a hypervisor call if we're crashing */
         if (firmware_has_feature(FW_FEATURE_SPLPAR) && !crash_shutdown) {
-                unsigned long addr;
+                int ret;
+                int cpu = smp_processor_id();
+                int hwcpu = hard_smp_processor_id();
 
-                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",
-                               smp_processor_id(),
-                               hard_smp_processor_id());
+                if (get_lppaca()->dtl_enable_mask) {
+                        ret = unregister_dtl(hwcpu);
+                        if (ret) {
+                                pr_err("WARNING: DTL deregistration for cpu "
+                                       "%d (hw %d) failed with %d\n",
+                                       cpu, hwcpu, ret);
+                        }
+                }
+
+                ret = unregister_slb_shadow(hwcpu);
+                if (ret) {
+                        pr_err("WARNING: SLB shadow buffer deregistration "
+                               "for cpu %d (hw %d) failed with %d\n",
+                               cpu, hwcpu, 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(hwcpu);
+                if (ret) {
+                        pr_err("WARNING: VPA deregistration for cpu %d "
+                               "(hw %d) failed with %d\n", cpu, hwcpu, ret);
                 }
         }
 }