[PATCH 22/48] tick-sched: Fix two new uses of __get_cpu_ptr

From: Christoph Lameter
Date: Fri Feb 14 2014 - 15:20:10 EST


Two new uses introduced in 3.14-rc1.

Signed-off-by: Christoph Lameter <cl@xxxxxxxxx>

Index: linux/kernel/time/tick-sched.c
===================================================================
--- linux.orig/kernel/time/tick-sched.c 2014-02-03 13:36:18.968910485 -0600
+++ linux/kernel/time/tick-sched.c 2014-02-03 13:36:18.968910485 -0600
@@ -909,7 +909,7 @@
*/
void tick_nohz_idle_exit(void)
{
- struct tick_sched *ts = &__get_cpu_var(tick_cpu_sched);
+ struct tick_sched *ts = this_cpu_ptr(&tick_cpu_sched);
ktime_t now;

local_irq_disable();
@@ -1026,7 +1026,7 @@

static inline void tick_nohz_irq_enter(void)
{
- struct tick_sched *ts = &__get_cpu_var(tick_cpu_sched);
+ struct tick_sched *ts = this_cpu_ptr(&tick_cpu_sched);
ktime_t now;

if (!ts->idle_active && !ts->tick_stopped)

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/