diff options
| author | Michael Ellerman | 2014-11-05 11:00:31 +0100 |
|---|---|---|
| committer | Michael Ellerman | 2014-11-05 11:00:31 +0100 |
| commit | dd521d1eb4bc7f12a0d440134cb3a72852b6da9c (patch) | |
| tree | f573c86df9bd60626ad9a8746b82e254b7cac977 /arch/powerpc/sysdev | |
| parent | Merge branch 'topic/pm-power-off' into next (diff) | |
| parent | powerpc: Replace __get_cpu_var uses (diff) | |
| download | kernel-qcow2-linux-dd521d1eb4bc7f12a0d440134cb3a72852b6da9c.tar.gz kernel-qcow2-linux-dd521d1eb4bc7f12a0d440134cb3a72852b6da9c.tar.xz kernel-qcow2-linux-dd521d1eb4bc7f12a0d440134cb3a72852b6da9c.zip | |
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) void xics_teardown_cpu(void) { - struct xics_cppr *os_cppr = &__get_cpu_var(xics_cppr); + struct xics_cppr *os_cppr = this_cpu_ptr(&xics_cppr); /* * we have to reset the cppr index to 0 because we're |