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

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

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: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarChristoph Lameter <cl@linux.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent bb964a92

drivers/clocksource/dummy_timer.c

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ static void dummy_timer_set_mode(enum clock_event_mode mode, 
static void dummy_timer_setup(void)

{

	int cpu = smp_processor_id();

	struct clock_event_device *evt = __this_cpu_ptr(&dummy_timer_evt);

	struct clock_event_device *evt = raw_cpu_ptr(&dummy_timer_evt);



	evt->name	= "dummy_timer";

	evt->features	= CLOCK_EVT_FEAT_PERIODIC |

kernel/irq_work.c

+6 −6
Original line number Diff line number Diff line
@@ -95,11 +95,11 @@ bool irq_work_queue(struct irq_work *work) 


	/* If the work is "lazy", handle it from next tick if any */

	if (work->flags & IRQ_WORK_LAZY) {

		if (llist_add(&work->llnode, &__get_cpu_var(lazy_list)) &&

		if (llist_add(&work->llnode, this_cpu_ptr(&lazy_list)) &&

		    tick_nohz_tick_stopped())

			arch_irq_work_raise();

	} else {

		if (llist_add(&work->llnode, &__get_cpu_var(raised_list)))

		if (llist_add(&work->llnode, this_cpu_ptr(&raised_list)))

			arch_irq_work_raise();

	}
@@ -113,8 +113,8 @@ bool irq_work_needs_cpu(void) 
{

	struct llist_head *raised, *lazy;



	raised = &__get_cpu_var(raised_list);

	lazy = &__get_cpu_var(lazy_list);

	raised = this_cpu_ptr(&raised_list);

	lazy = this_cpu_ptr(&lazy_list);

	if (llist_empty(raised) && llist_empty(lazy))

		return false;
@@ -166,8 +166,8 @@ static void irq_work_run_list(struct llist_head *list) 
 */

void irq_work_run(void)

{

	irq_work_run_list(&__get_cpu_var(raised_list));

	irq_work_run_list(&__get_cpu_var(lazy_list));

	irq_work_run_list(this_cpu_ptr(&raised_list));

	irq_work_run_list(this_cpu_ptr(&lazy_list));

}

EXPORT_SYMBOL_GPL(irq_work_run);

kernel/sched/clock.c

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ static DEFINE_PER_CPU_SHARED_ALIGNED(struct sched_clock_data, sched_clock_data); 


static inline struct sched_clock_data *this_scd(void)

{

	return &__get_cpu_var(sched_clock_data);

	return this_cpu_ptr(&sched_clock_data);

}



static inline struct sched_clock_data *cpu_sdc(int cpu)

kernel/softirq.c

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

kernel/time/hrtimer.c

+3 −3
Original line number Diff line number Diff line
@@ -1144,7 +1144,7 @@ static void __hrtimer_init(struct hrtimer *timer, clockid_t clock_id, 


	memset(timer, 0, sizeof(struct hrtimer));



	cpu_base = &__raw_get_cpu_var(hrtimer_bases);

	cpu_base = raw_cpu_ptr(&hrtimer_bases);



	if (clock_id == CLOCK_REALTIME && mode != HRTIMER_MODE_ABS)

		clock_id = CLOCK_MONOTONIC;
@@ -1187,7 +1187,7 @@ int hrtimer_get_res(const clockid_t which_clock, struct timespec *tp) 
	struct hrtimer_cpu_base *cpu_base;

	int base = hrtimer_clockid_to_base(which_clock);



	cpu_base = &__raw_get_cpu_var(hrtimer_bases);

	cpu_base = raw_cpu_ptr(&hrtimer_bases);

	*tp = ktime_to_timespec(cpu_base->clock_base[base].resolution);



	return 0;
@@ -1376,7 +1376,7 @@ static void __hrtimer_peek_ahead_timers(void) 
	if (!hrtimer_hres_active())

		return;



	td = &__get_cpu_var(tick_cpu_device);

	td = this_cpu_ptr(&tick_cpu_device);

	if (td && td->evtdev)

		hrtimer_interrupt(td->evtdev);

}