Merge branch 'upstream-fixes'

1 files changed, 6 insertions, 6 deletions

diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c
index 7fe4a5c944c9..b5b2add7ad1e 100644
--- a/arch/powerpc/kernel/rtas.c
+++ b/arch/powerpc/kernel/rtas.c
@@ -22,6 +22,7 @@
 
 #include <asm/prom.h>
 #include <asm/rtas.h>
+#include <asm/hvcall.h>
 #include <asm/semaphore.h>
 #include <asm/machdep.h>
 #include <asm/page.h>
@@ -565,6 +566,7 @@ static int ibm_suspend_me_token = RTAS_UNKNOWN_SERVICE;
 #ifdef CONFIG_PPC_PSERIES
 static void rtas_percpu_suspend_me(void *info)
 {
+        int i;
         long rc;
         long flags;
         struct rtas_suspend_me_data *data =
@@ -587,18 +589,16 @@ static void rtas_percpu_suspend_me(void *info)
 
         if (rc == H_Continue) {
                 data->waiting = 0;
-                rtas_call(ibm_suspend_me_token, 0, 1,
-                          data->args->args);
+                data->args->args[data->args->nargs] =
+                        rtas_call(ibm_suspend_me_token, 0, 1, NULL);
+                for_each_cpu(i)
+                        plpar_hcall_norets(H_PROD,i);
         } else {
                 data->waiting = -EBUSY;
                 printk(KERN_ERR "Error on H_Join hypervisor call\n");
         }
 
 out:
-        /* before we restore interrupts, make sure we don't
-         * generate a spurious soft lockup errors
-         */
-        touch_softlockup_watchdog();
         local_irq_restore(flags);
         return;
 }