Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754836AbaJ1PdR (ORCPT ); Tue, 28 Oct 2014 11:33:17 -0400 Received: from www.linutronix.de ([62.245.132.108]:49446 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751126AbaJ1PdQ (ORCPT ); Tue, 28 Oct 2014 11:33:16 -0400 Date: Tue, 28 Oct 2014 16:33:06 +0100 (CET) From: Thomas Gleixner To: Christoph Lameter cc: Tejun Heo , linux-arm-kernel@lists.infradead.org, Will Deacon , Catalin Marinas , John Stultz , linux-kernel@vger.kernel.org Subject: Re: [percpu] Convert remaining __get_cpu_var uses in 3.18-rcX In-Reply-To: Message-ID: References: User-Agent: Alpine 2.11 (DEB 23 2013-08-11) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-Linutronix-Spam-Score: -1.0 X-Linutronix-Spam-Level: - X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required, ALL_TRUSTED=-1,SHORTCIRCUIT=-0.0001,URIBL_BLOCKED=0.001 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 27 Oct 2014, 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 Acked-by: Thomas Gleixner > 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 > Index: linux/kernel/irq_work.c > =================================================================== > --- linux.orig/kernel/irq_work.c > +++ linux/kernel/irq_work.c > @@ -175,11 +175,11 @@ EXPORT_SYMBOL_GPL(irq_work_run); > > void irq_work_tick(void) > { > - struct llist_head *raised = &__get_cpu_var(raised_list); > + struct llist_head *raised = this_cpu_ptr(&raised_list); > > if (!llist_empty(raised) && !arch_irq_work_has_interrupt()) > irq_work_run_list(raised); > - irq_work_run_list(&__get_cpu_var(lazy_list)); > + irq_work_run_list(this_cpu_ptr(&lazy_list)); > } > > /* > Index: linux/kernel/time/tick-sched.c > =================================================================== > --- linux.orig/kernel/time/tick-sched.c > +++ linux/kernel/time/tick-sched.c > @@ -235,7 +235,7 @@ void tick_nohz_full_kick(void) > if (!tick_nohz_full_cpu(smp_processor_id())) > return; > > - irq_work_queue(&__get_cpu_var(nohz_full_kick_work)); > + irq_work_queue(this_cpu_ptr(&nohz_full_kick_work)); > } > > /* > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/