Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56e4dea8 authored by Christoph Lameter's avatar Christoph Lameter Committed by Tejun Heo
Browse files

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: default avatarChristoph Lameter <cl@linux.com>
Acked-by: default avatarWill Deacon <will.deacon@arm.com>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent 9f295664

arch/arm64/kernel/psci.c

+2 −2
Original line number Diff line number Diff line
@@ -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

kernel/irq_work.c

+2 −2
Original line number Diff line number Diff line
@@ -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));

}



/*

kernel/time/tick-sched.c

+1 −1
Original line number Diff line number Diff line
@@ -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));

}



/*