diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2014-11-05 13:00:31 +0300 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2014-11-05 13:00:31 +0300 |
| commit | dd521d1eb4bc7f12a0d440134cb3a72852b6da9c (patch) | |
| tree | f573c86df9bd60626ad9a8746b82e254b7cac977 /arch/powerpc/platforms/powernv | |
| parent | 8418804ef27e5f7988480d86ecf9dfd56cebc53b (diff) | |
| parent | 69111bac42f5ceacdd22e30947837ceb2c4493ed (diff) | |
| download | linux-dd521d1eb4bc7f12a0d440134cb3a72852b6da9c.tar.xz | |
Merge branch 'topic/get-cpu-var' into next
Diffstat (limited to 'arch/powerpc/platforms/powernv')
| -rw-r--r-- | arch/powerpc/platforms/powernv/opal-tracepoints.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/powernv/opal-tracepoints.c b/arch/powerpc/platforms/powernv/opal-tracepoints.c index ae14c40b4b1c..e11273b2386d 100644 --- a/arch/powerpc/platforms/powernv/opal-tracepoints.c +++ b/arch/powerpc/platforms/powernv/opal-tracepoints.c @@ -48,7 +48,7 @@ void __trace_opal_entry(unsigned long opcode, unsigned long *args) local_irq_save(flags); - depth = &__get_cpu_var(opal_trace_depth); + depth = this_cpu_ptr(&opal_trace_depth); if (*depth) goto out; @@ -69,7 +69,7 @@ void __trace_opal_exit(long opcode, unsigned long retval) local_irq_save(flags); - depth = &__get_cpu_var(opal_trace_depth); + depth = this_cpu_ptr(&opal_trace_depth); if (*depth) goto out; |