kernel misc: Replace __get_cpu_var uses

Replace uses of __get_cpu_var for address calculation with this_cpu_ptr.

Cc: akpm@linux-foundation.org
Signed-off-by: Christoph Lameter <cl@linux.com>
Signed-off-by: Tejun Heo <tj@kernel.org>

diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index e04c455a0e3860b2aa5784d4c2522a21300525e4..960fbfc6cd0ae0ddd6767f14ad2dec8e4625cced 100644 (file)
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -2628,7 +2628,7 @@ void wake_up_klogd(void)
        preempt_disable();
        if (waitqueue_active(&log_wait)) {
                this_cpu_or(printk_pending, PRINTK_PENDING_WAKEUP);
-               irq_work_queue(&__get_cpu_var(wake_up_klogd_work));
+               irq_work_queue(this_cpu_ptr(&wake_up_klogd_work));
        }
        preempt_enable();
 }
@@ -2644,7 +2644,7 @@ int printk_deferred(const char *fmt, ...)
        va_end(args);
 
        __this_cpu_or(printk_pending, PRINTK_PENDING_OUTPUT);
-       irq_work_queue(&__get_cpu_var(wake_up_klogd_work));
+       irq_work_queue(this_cpu_ptr(&wake_up_klogd_work));
        preempt_enable();
 
        return r;

diff --git a/kernel/smp.c b/kernel/smp.c
index aff8aa14f54795faa42ae9482da75e3ea9610a82..af24183fe6bb111228d6a26bb077527928d8ab5f 100644 (file)
--- a/kernel/smp.c
+++ b/kernel/smp.c
@@ -164,7 +164,7 @@ static int generic_exec_single(int cpu, struct call_single_data *csd,
        if (!csd) {
                csd = &csd_stack;
                if (!wait)
-                       csd = &__get_cpu_var(csd_data);
+                       csd = this_cpu_ptr(&csd_data);
        }
 
        csd_lock(csd);
@@ -229,7 +229,7 @@ static void flush_smp_call_function_queue(bool warn_cpu_offline)
 
        WARN_ON(!irqs_disabled());
 
-       head = &__get_cpu_var(call_single_queue);
+       head = this_cpu_ptr(&call_single_queue);
        entry = llist_del_all(head);
        entry = llist_reverse_order(entry);
 
@@ -419,7 +419,7 @@ void smp_call_function_many(const struct cpumask *mask,
                return;
        }
 
-       cfd = &__get_cpu_var(cfd_data);
+       cfd = this_cpu_ptr(&cfd_data);
 
        cpumask_and(cfd->cpumask, mask, cpu_online_mask);
        cpumask_clear_cpu(this_cpu, cfd->cpumask);