3 files changed, 14 insertions, 18 deletions

diff --git a/arch/powerpc/platforms/pseries/hotplug-cpu.c b/arch/powerpc/platforms/pseries/hotplug-cpu.c
index bc0288501f17..83a3ca2fd282 100644
--- a/arch/powerpc/platforms/pseries/hotplug-cpu.c
+++ b/arch/powerpc/platforms/pseries/hotplug-cpu.c
@@ -135,7 +135,7 @@ static void pseries_mach_cpu_die(void)
                 get_lppaca()->idle = 0;
 
                 if (get_preferred_offline_state(cpu) == CPU_STATE_ONLINE) {
-                        unregister_slb_shadow(hwcpu, __pa(get_slb_shadow()));
+                        unregister_slb_shadow(hwcpu);
 
                         /*
                          * Call to start_secondary_resume() will not return.
@@ -150,7 +150,7 @@ static void pseries_mach_cpu_die(void)
         WARN_ON(get_preferred_offline_state(cpu) != CPU_STATE_OFFLINE);
 
         set_cpu_current_state(cpu, CPU_STATE_OFFLINE);
-        unregister_slb_shadow(hwcpu, __pa(get_slb_shadow()));
+        unregister_slb_shadow(hwcpu);
         rtas_stop_self();
 
         /* Should never get here... */
diff --git a/arch/powerpc/platforms/pseries/kexec.c b/arch/powerpc/platforms/pseries/kexec.c
index 3bae8bd7db3b..7d94bdc63d50 100644
--- a/arch/powerpc/platforms/pseries/kexec.c
+++ b/arch/powerpc/platforms/pseries/kexec.c
@@ -25,34 +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();
 
                 if (get_lppaca()->dtl_enable_mask) {
-                        ret = unregister_dtl(hard_smp_processor_id());
+                        ret = unregister_dtl(hwcpu);
                         if (ret) {
                                 pr_err("WARNING: DTL deregistration for cpu "
                                        "%d (hw %d) failed with %d\n",
-                                       smp_processor_id(),
-                                       hard_smp_processor_id(), ret);
+                                       cpu, hwcpu, ret);
                         }
                 }
 
-                addr = __pa(get_slb_shadow());
-                ret = unregister_slb_shadow(hard_smp_processor_id(), addr);
+                ret = unregister_slb_shadow(hwcpu);
                 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(), ret);
+                               cpu, hwcpu, ret);
                 }
 
-                addr = __pa(get_lppaca());
-                ret = unregister_vpa(hard_smp_processor_id(), addr);
+                ret = unregister_vpa(hwcpu);
                 if (ret) {
                         pr_err("WARNING: VPA deregistration for cpu %d "
-                               "(hw %d) failed with %d\n", smp_processor_id(),
-                               hard_smp_processor_id(), ret);
+                               "(hw %d) failed with %d\n", cpu, hwcpu, ret);
                 }
         }
 }
diff --git a/arch/powerpc/platforms/pseries/plpar_wrappers.h b/arch/powerpc/platforms/pseries/plpar_wrappers.h
index a6921aec2d6f..41c24c146d6a 100644
--- a/arch/powerpc/platforms/pseries/plpar_wrappers.h
+++ b/arch/powerpc/platforms/pseries/plpar_wrappers.h
@@ -53,9 +53,9 @@ static inline long vpa_call(unsigned long flags, unsigned long cpu,
         return plpar_hcall_norets(H_REGISTER_VPA, flags, cpu, vpa);
 }
 
-static inline long unregister_vpa(unsigned long cpu, unsigned long vpa)
+static inline long unregister_vpa(unsigned long cpu)
 {
-        return vpa_call(0x5, cpu, vpa);
+        return vpa_call(0x5, cpu, 0);
 }
 
 static inline long register_vpa(unsigned long cpu, unsigned long vpa)
@@ -63,9 +63,9 @@ static inline long register_vpa(unsigned long cpu, unsigned long vpa)
         return vpa_call(0x1, cpu, vpa);
 }
 
-static inline long unregister_slb_shadow(unsigned long cpu, unsigned long vpa)
+static inline long unregister_slb_shadow(unsigned long cpu)
 {
-        return vpa_call(0x7, cpu, vpa);
+        return vpa_call(0x7, cpu, 0);
 }
 
 static inline long register_slb_shadow(unsigned long cpu, unsigned long vpa)