diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-05-20 13:05:15 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-05-23 13:59:54 +0200 |
| commit | ab8177bc53e8ae3a3ba6d200ce2c2dae263f7ee5 (patch) | |
| tree | c8b370496497b4f96d6a17da906bdd9314e9a090 /kernel/time/alarmtimer.c | |
| parent | f24444b01bf6c51c300fd3ffc73423383d747882 (diff) | |
| download | olio-linux-3.10-ab8177bc53e8ae3a3ba6d200ce2c2dae263f7ee5.tar.xz olio-linux-3.10-ab8177bc53e8ae3a3ba6d200ce2c2dae263f7ee5.zip | |
hrtimers: Avoid touching inactive timer bases
Instead of iterating over all possible timer bases avoid it by marking
the active bases in the cpu base.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Peter Zijlstra <peterz@infradead.org>
Diffstat (limited to 'kernel/time/alarmtimer.c')
| -rw-r--r-- | kernel/time/alarmtimer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c index c6027fe9a4e..2d966244ea6 100644 --- a/kernel/time/alarmtimer.c +++ b/kernel/time/alarmtimer.c @@ -494,7 +494,7 @@ static int update_rmtp(ktime_t exp, enum alarmtimer_type type, */ static long __sched alarm_timer_nsleep_restart(struct restart_block *restart) { - enum alarmtimer_type type = restart->nanosleep.index; + enum alarmtimer_type type = restart->nanosleep.clockid; ktime_t exp; struct timespec __user *rmtp; struct alarm alarm; @@ -573,7 +573,7 @@ static int alarm_timer_nsleep(const clockid_t which_clock, int flags, restart = ¤t_thread_info()->restart_block; restart->fn = alarm_timer_nsleep_restart; - restart->nanosleep.index = type; + restart->nanosleep.clockid = type; restart->nanosleep.expires = exp.tv64; restart->nanosleep.rmtp = rmtp; ret = -ERESTART_RESTARTBLOCK; |