1 files changed, 10 insertions, 4 deletions

diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c
index 948e0e3b3547..7bc73af6c7b9 100644
--- a/arch/powerpc/platforms/pseries/lpar.c
+++ b/arch/powerpc/platforms/pseries/lpar.c
@@ -546,6 +546,13 @@ void __trace_hcall_entry(unsigned long opcode, unsigned long *args)
         unsigned long flags;
         unsigned int *depth;
 
+        /*
+         * We cannot call tracepoints inside RCU idle regions which
+         * means we must not trace H_CEDE.
+         */
+        if (opcode == H_CEDE)
+                return;
+
         local_irq_save(flags);
 
         depth = &__get_cpu_var(hcall_trace_depth);
@@ -556,8 +563,6 @@ void __trace_hcall_entry(unsigned long opcode, unsigned long *args)
         (*depth)++;
         preempt_disable();
         trace_hcall_entry(opcode, args);
-        if (opcode == H_CEDE)
-                rcu_idle_enter();
         (*depth)--;
 
 out:
@@ -570,6 +575,9 @@ void __trace_hcall_exit(long opcode, unsigned long retval,
         unsigned long flags;
         unsigned int *depth;
 
+        if (opcode == H_CEDE)
+                return;
+
         local_irq_save(flags);
 
         depth = &__get_cpu_var(hcall_trace_depth);
@@ -578,8 +586,6 @@ void __trace_hcall_exit(long opcode, unsigned long retval,
                 goto out;
 
         (*depth)++;
-        if (opcode == H_CEDE)
-                rcu_idle_exit();
         trace_hcall_exit(opcode, retval, retbuf);
         preempt_enable();
         (*depth)--;