diff options
| author | Christoph Lameter | 2014-08-17 19:30:25 +0200 |
|---|---|---|
| committer | Tejun Heo | 2014-08-26 19:45:44 +0200 |
| commit | 22127e93c587afa01e4f7225d2d1cf1d26ae7dfe (patch) | |
| tree | 59e32c175bfe72758e44c1fe1215c13045c80b83 /kernel/time/tick-common.c | |
| parent | kernel misc: Replace __get_cpu_var uses (diff) | |
| download | kernel-qcow2-linux-22127e93c587afa01e4f7225d2d1cf1d26ae7dfe.tar.gz kernel-qcow2-linux-22127e93c587afa01e4f7225d2d1cf1d26ae7dfe.tar.xz kernel-qcow2-linux-22127e93c587afa01e4f7225d2d1cf1d26ae7dfe.zip | |
time: Replace __get_cpu_var uses
Convert uses of __get_cpu_var for creating a address from a percpu
offset to this_cpu_ptr.
The two cases where get_cpu_var is used to actually access a percpu
variable are changed to use this_cpu_read/raw_cpu_read.
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Christoph Lameter <cl@linux.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'kernel/time/tick-common.c')
| -rw-r--r-- | kernel/time/tick-common.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/time/tick-common.c b/kernel/time/tick-common.c index 0a0608edeb26..decfb5f6edb0 100644 --- a/kernel/time/tick-common.c +++ b/kernel/time/tick-common.c @@ -224,7 +224,7 @@ static void tick_setup_device(struct tick_device *td, void tick_install_replacement(struct clock_event_device *newdev) { - struct tick_device *td = &__get_cpu_var(tick_cpu_device); + struct tick_device *td = this_cpu_ptr(&tick_cpu_device); int cpu = smp_processor_id(); clockevents_exchange_device(td->evtdev, newdev); @@ -374,14 +374,14 @@ void tick_shutdown(unsigned int *cpup) void tick_suspend(void) { - struct tick_device *td = &__get_cpu_var(tick_cpu_device); + struct tick_device *td = this_cpu_ptr(&tick_cpu_device); clockevents_shutdown(td->evtdev); } void tick_resume(void) { - struct tick_device *td = &__get_cpu_var(tick_cpu_device); + struct tick_device *td = this_cpu_ptr(&tick_cpu_device); int broadcast = tick_resume_broadcast(); clockevents_set_mode(td->evtdev, CLOCK_EVT_MODE_RESUME); |