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

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

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: default avatarChristoph Lameter <cl@linux.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent 7d1311b9

kernel/printk/printk.c

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

kernel/smp.c

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