diff options
author | Christoph Lameter <cl@linux.com> | 2014-08-17 12:30:25 -0500 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2014-08-26 13:45:44 -0400 |
commit | 22127e93c587afa01e4f7225d2d1cf1d26ae7dfe (patch) | |
tree | 59e32c175bfe72758e44c1fe1215c13045c80b83 /kernel/softirq.c | |
parent | bb964a92ce70ac2039115edd019aa5eef8faa6bb (diff) | |
download | linux-22127e93c587afa01e4f7225d2d1cf1d26ae7dfe.tar.gz linux-22127e93c587afa01e4f7225d2d1cf1d26ae7dfe.tar.bz2 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/softirq.c')
-rw-r--r-- | kernel/softirq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/softirq.c b/kernel/softirq.c index 5918d227730f..2d44b5714fe6 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c @@ -485,7 +485,7 @@ static void tasklet_action(struct softirq_action *a) local_irq_disable(); list = __this_cpu_read(tasklet_vec.head); __this_cpu_write(tasklet_vec.head, NULL); - __this_cpu_write(tasklet_vec.tail, &__get_cpu_var(tasklet_vec).head); + __this_cpu_write(tasklet_vec.tail, this_cpu_ptr(&tasklet_vec.head)); local_irq_enable(); while (list) { @@ -521,7 +521,7 @@ static void tasklet_hi_action(struct softirq_action *a) local_irq_disable(); list = __this_cpu_read(tasklet_hi_vec.head); __this_cpu_write(tasklet_hi_vec.head, NULL); - __this_cpu_write(tasklet_hi_vec.tail, &__get_cpu_var(tasklet_hi_vec).head); + __this_cpu_write(tasklet_hi_vec.tail, this_cpu_ptr(&tasklet_hi_vec.head)); local_irq_enable(); while (list) { |