lkml.org 
[lkml]   [2014]   [Oct]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [percpu] Convert remaining __get_cpu_var uses in 3.18-rcX
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 <cl@linux.com>

Acked-by: Thomas Gleixner <tglx@linutronix.de>

> 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));
> }
>
> /*
>


\
 
 \ /
  Last update: 2014-10-28 17:01    [W:0.086 / U:0.144 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site