diff options
| author | Christoph Lameter <cl@linux.com> | 2014-10-27 16:49:45 +0100 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2014-10-29 16:18:18 +0100 |
| commit | 56e4dea81a55c338eede625f715c7fa21f1a28c4 (patch) | |
| tree | 9d2ef7f447aa3a811fc77e84c506341e5469b087 /arch/arm64/kernel/psci.c | |
| parent | percpu: off by one in BUG_ON() (diff) | |
| download | linux-56e4dea81a55c338eede625f715c7fa21f1a28c4.tar.xz linux-56e4dea81a55c338eede625f715c7fa21f1a28c4.zip | |
percpu: Convert remaining __get_cpu_var uses in 3.18-rcX
During the 3.18 merge period additional __get_cpu_var uses were
added. The patch converts these to this_cpu_ptr().
Signed-off-by: Christoph Lameter <cl@linux.com>
Acked-by: Will Deacon <will.deacon@arm.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'arch/arm64/kernel/psci.c')
| -rw-r--r-- | arch/arm64/kernel/psci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/kernel/psci.c b/arch/arm64/kernel/psci.c index 866c1c821860..d56394b6dc99 100644 --- a/arch/arm64/kernel/psci.c +++ b/arch/arm64/kernel/psci.c @@ -511,7 +511,7 @@ static int cpu_psci_cpu_kill(unsigned int cpu) static int psci_suspend_finisher(unsigned long index) { - struct psci_power_state *state = __get_cpu_var(psci_power_state); + struct psci_power_state *state = __this_cpu_read(psci_power_state); return psci_ops.cpu_suspend(state[index - 1], virt_to_phys(cpu_resume)); @@ -520,7 +520,7 @@ static int psci_suspend_finisher(unsigned long index) static int __maybe_unused cpu_psci_cpu_suspend(unsigned long index) { int ret; - struct psci_power_state *state = __get_cpu_var(psci_power_state); + struct psci_power_state *state = __this_cpu_read(psci_power_state); /* * idle state index 0 corresponds to wfi, should never be called * from the cpu_suspend operations |