diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2014-11-05 05:00:31 -0500 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2014-11-05 05:00:31 -0500 |
| commit | dd521d1eb4bc7f12a0d440134cb3a72852b6da9c (patch) | |
| tree | f573c86df9bd60626ad9a8746b82e254b7cac977 /arch/powerpc/sysdev | |
| parent | 8418804ef27e5f7988480d86ecf9dfd56cebc53b (diff) | |
| parent | 69111bac42f5ceacdd22e30947837ceb2c4493ed (diff) | |
Merge branch 'topic/get-cpu-var' into next
Diffstat (limited to 'arch/powerpc/sysdev')
| -rw-r--r-- | arch/powerpc/sysdev/xics/xics-common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/xics/xics-common.c b/arch/powerpc/sysdev/xics/xics-common.c index fe0cca477164..365249cd346b 100644 --- a/arch/powerpc/sysdev/xics/xics-common.c +++ b/arch/powerpc/sysdev/xics/xics-common.c | |||
| @@ -155,7 +155,7 @@ int __init xics_smp_probe(void) | |||
| 155 | 155 | ||
| 156 | void xics_teardown_cpu(void) | 156 | void xics_teardown_cpu(void) |
| 157 | { | 157 | { |
| 158 | struct xics_cppr *os_cppr = &__get_cpu_var(xics_cppr); | 158 | struct xics_cppr *os_cppr = this_cpu_ptr(&xics_cppr); |
| 159 | 159 | ||
| 160 | /* | 160 | /* |
| 161 | * we have to reset the cppr index to 0 because we're | 161 | * we have to reset the cppr index to 0 because we're |