2 files changed, 3 insertions, 3 deletions

diff --git a/arch/powerpc/platforms/pseries/hvCall_inst.c b/arch/powerpc/platforms/pseries/hvCall_inst.c
index f106662f4381..c9311cfdfcac 100644
--- a/arch/powerpc/platforms/pseries/hvCall_inst.c
+++ b/arch/powerpc/platforms/pseries/hvCall_inst.c
@@ -109,7 +109,7 @@ static void probe_hcall_entry(void *ignored, unsigned long opcode, unsigned long
         if (opcode > MAX_HCALL_OPCODE)
                 return;
 
-        h = &get_cpu_var(hcall_stats)[opcode / 4];
+        h = &__get_cpu_var(hcall_stats)[opcode / 4];
         h->tb_start = mftb();
         h->purr_start = mfspr(SPRN_PURR);
 }
@@ -126,8 +126,6 @@ static void probe_hcall_exit(void *ignored, unsigned long opcode, unsigned long
         h->num_calls++;
         h->tb_total += mftb() - h->tb_start;
         h->purr_total += mfspr(SPRN_PURR) - h->purr_start;
-
-        put_cpu_var(hcall_stats);
 }
 
 static int __init hcall_inst_init(void)
diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c
index 27a49508b410..dc36ea6c7727 100644
--- a/arch/powerpc/platforms/pseries/lpar.c
+++ b/arch/powerpc/platforms/pseries/lpar.c
@@ -554,6 +554,7 @@ void __trace_hcall_entry(unsigned long opcode, unsigned long *args)
                 goto out;
 
         (*depth)++;
+        preempt_disable();
         trace_hcall_entry(opcode, args);
         (*depth)--;
 
@@ -576,6 +577,7 @@ void __trace_hcall_exit(long opcode, unsigned long retval,
 
         (*depth)++;
         trace_hcall_exit(opcode, retval, retbuf);
+        preempt_enable();
         (*depth)--;
 
 out: