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/ps3 | |
| 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/ps3')
| -rw-r--r-- | arch/powerpc/platforms/ps3/interrupt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/ps3/interrupt.c b/arch/powerpc/platforms/ps3/interrupt.c index 5f3b23220b8e..a6c42f34303a 100644 --- a/arch/powerpc/platforms/ps3/interrupt.c +++ b/arch/powerpc/platforms/ps3/interrupt.c @@ -711,7 +711,7 @@ void __init ps3_register_ipi_irq(unsigned int cpu, unsigned int virq) static unsigned int ps3_get_irq(void) { - struct ps3_private *pd = &__get_cpu_var(ps3_private); + struct ps3_private *pd = this_cpu_ptr(&ps3_private); u64 x = (pd->bmp.status & pd->bmp.mask); unsigned int plug; |