On Mon, Oct 27, 2014 at 03:49:45PM +0000, Christoph Lameter wrote: > 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 <[email protected]> > > Index: linux/arch/arm64/kernel/psci.c > =================================================================== > --- linux.orig/arch/arm64/kernel/psci.c > +++ linux/arch/arm64/kernel/psci.c > @@ -511,7 +511,7 @@ static int cpu_psci_cpu_kill(unsigned in > > 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(unsigne > 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
Apologies for not spotting this one during review: Acked-by: Will Deacon <[email protected]> Feel free to take this via some other route (than the arm64 tree). Will -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
