diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-12-28 12:16:58 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-12-28 12:16:58 +1100 |
| commit | ff71abad53cdd1856e6a77ef71a09f1df46c9b87 (patch) | |
| tree | 82f61a0765f7ea45fb6bd87a537bb656eb181601 /kernel/time/tick-oneshot.c | |
| parent | aaca8c6eac21c9a662d87ff0e83eb176af970213 (diff) | |
| parent | b924047fe07689ed9b7f0a8e14826534caaff8fc (diff) | |
Merge remote branch 'percpu/for-next'
Diffstat (limited to 'kernel/time/tick-oneshot.c')
| -rw-r--r-- | kernel/time/tick-oneshot.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/time/tick-oneshot.c b/kernel/time/tick-oneshot.c index aada0e52680a..5cbc101f908b 100644 --- a/kernel/time/tick-oneshot.c +++ b/kernel/time/tick-oneshot.c @@ -95,7 +95,7 @@ int tick_dev_program_event(struct clock_event_device *dev, ktime_t expires, */ int tick_program_event(ktime_t expires, int force) { - struct clock_event_device *dev = __get_cpu_var(tick_cpu_device).evtdev; + struct clock_event_device *dev = __this_cpu_read(tick_cpu_device.evtdev); return tick_dev_program_event(dev, expires, force); } @@ -167,7 +167,7 @@ int tick_oneshot_mode_active(void) int ret; local_irq_save(flags); - ret = __get_cpu_var(tick_cpu_device).mode == TICKDEV_MODE_ONESHOT; + ret = __this_cpu_read(tick_cpu_device.mode) == TICKDEV_MODE_ONESHOT; local_irq_restore(flags); return ret; |