AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-11-24 06:50:58 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

percpu: Convert remaining __get_cpu_var uses in 3.18-rcX

Browse Source 
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>
This commit is contained in:
Christoph Lameter 2014-10-27 10:49:45 -05:00 committed by Tejun Heo
parent 9f295664e2
commit 56e4dea81a
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm64/kernel/psci.c
View File

@ -511,7 +511,7 @@ static int cpu_psci_cpu_kill(unsigned int cpu)
static int psci_suspend_finisher(unsigned long index) 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], return psci_ops.cpu_suspend(state[index - 1],
virt_to_phys(cpu_resume)); 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) static int __maybe_unused cpu_psci_cpu_suspend(unsigned long index)
{ {
int ret; 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 * idle state index 0 corresponds to wfi, should never be called
* from the cpu_suspend operations * from the cpu_suspend operations

4
kernel/irq_work.c
View File

@ -175,11 +175,11 @@ EXPORT_SYMBOL_GPL(irq_work_run);
void irq_work_tick(void) 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()) if (!llist_empty(raised) && !arch_irq_work_has_interrupt())
irq_work_run_list(raised); irq_work_run_list(raised);
irq_work_run_list(&__get_cpu_var(lazy_list)); irq_work_run_list(this_cpu_ptr(&lazy_list));
} }
/* /*

2
kernel/time/tick-sched.c
View File

@ -235,7 +235,7 @@ void tick_nohz_full_kick(void)
if (!tick_nohz_full_cpu(smp_processor_id())) if (!tick_nohz_full_cpu(smp_processor_id()))
return; return;
irq_work_queue(&__get_cpu_var(nohz_full_kick_work)); irq_work_queue(this_cpu_ptr(&nohz_full_kick_work));
} }
/* /*