2 files changed, 8 insertions, 3 deletions

diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c
index 517b1d8f455b..9f843cdfee9e 100644
--- a/arch/powerpc/kernel/rtas.c
+++ b/arch/powerpc/kernel/rtas.c
@@ -716,7 +716,6 @@ static int __rtas_suspend_last_cpu(struct rtas_suspend_me_data *data, int wake_w
         int cpu;
 
         slb_set_size(SLB_MIN_SIZE);
-        stop_topology_update();
         printk(KERN_DEBUG "calling ibm,suspend-me on cpu %i\n", smp_processor_id());
 
         while (rc == H_MULTI_THREADS_ACTIVE && !atomic_read(&data->done) &&
@@ -732,7 +731,6 @@ static int __rtas_suspend_last_cpu(struct rtas_suspend_me_data *data, int wake_w
                 rc = atomic_read(&data->error);
 
         atomic_set(&data->error, rc);
-        start_topology_update();
         pSeries_coalesce_init();
 
         if (wake_when_done) {
@@ -846,6 +844,7 @@ int rtas_ibm_suspend_me(struct rtas_args *args)
         atomic_set(&data.error, 0);
         data.token = rtas_token("ibm,suspend-me");
         data.complete = &done;
+        stop_topology_update();
 
         /* Call function on all CPUs.  One of us will make the
          * rtas call
@@ -858,6 +857,8 @@ int rtas_ibm_suspend_me(struct rtas_args *args)
         if (atomic_read(&data.error) != 0)
                 printk(KERN_ERR "Error doing global join\n");
 
+        start_topology_update();
+
         return atomic_read(&data.error);
 }
 #else /* CONFIG_PPC_PSERIES */
diff --git a/arch/powerpc/platforms/pseries/suspend.c b/arch/powerpc/platforms/pseries/suspend.c
index b84a8b2238dd..47226e04126d 100644
--- a/arch/powerpc/platforms/pseries/suspend.c
+++ b/arch/powerpc/platforms/pseries/suspend.c
@@ -24,6 +24,7 @@
 #include <asm/machdep.h>
 #include <asm/mmu.h>
 #include <asm/rtas.h>
+#include <asm/topology.h>
 
 static u64 stream_id;
 static struct device suspend_dev;
@@ -138,8 +139,11 @@ static ssize_t store_hibernate(struct device *dev,
                         ssleep(1);
         } while (rc == -EAGAIN);
 
-        if (!rc)
+        if (!rc) {
+                stop_topology_update();
                 rc = pm_suspend(PM_SUSPEND_MEM);
+                start_topology_update();
+        }
 
         stream_id = 0;