Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

[karo-tx-linux.git] / arch / powerpc / platforms / pseries / lpar.c

diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c
index dc36ea6c77275549768d056353447768faf1d9e7..948e0e3b3547a28624b0a524b2b0de54eccd9460 100644 (file)
--- a/arch/powerpc/platforms/pseries/lpar.c
+++ b/arch/powerpc/platforms/pseries/lpar.c
@@ -556,6 +556,8 @@ 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:
@@ -576,6 +578,8 @@ 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)--;