diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 11:30:28 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 11:30:28 -0700 |
| commit | 30cb6d5f2eb24d15d20139d5ceefaccc68734bd7 (patch) | |
| tree | 773c5a98645e4b945343caddcfe5af365566ccc5 /kernel/posix-timers.c | |
| parent | 4867faab1e3eb8cc3f74e390357615d9b8e8cda6 (diff) | |
| parent | 68fa61c026057a39d6ccb850aa8785043afbee02 (diff) | |
| download | kernel_samsung_espresso10-30cb6d5f2eb24d15d20139d5ceefaccc68734bd7.zip kernel_samsung_espresso10-30cb6d5f2eb24d15d20139d5ceefaccc68734bd7.tar.gz kernel_samsung_espresso10-30cb6d5f2eb24d15d20139d5ceefaccc68734bd7.tar.bz2 | |
Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
hrtimers: Reorder clock bases
hrtimers: Avoid touching inactive timer bases
hrtimers: Make struct hrtimer_cpu_base layout less stupid
timerfd: Manage cancelable timers in timerfd
clockevents: Move C3 stop test outside lock
alarmtimer: Drop device refcount after rtc_open()
alarmtimer: Check return value of class_find_device()
timerfd: Allow timers to be cancelled when clock was set
hrtimers: Prepare for cancel on clock was set timers
Diffstat (limited to 'kernel/posix-timers.c')
| -rw-r--r-- | kernel/posix-timers.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c index e5498d7..a1b5edf 100644 --- a/kernel/posix-timers.c +++ b/kernel/posix-timers.c @@ -1056,7 +1056,7 @@ SYSCALL_DEFINE4(clock_nanosleep, const clockid_t, which_clock, int, flags, */ long clock_nanosleep_restart(struct restart_block *restart_block) { - clockid_t which_clock = restart_block->nanosleep.index; + clockid_t which_clock = restart_block->nanosleep.clockid; struct k_clock *kc = clockid_to_kclock(which_clock); if (WARN_ON_ONCE(!kc || !kc->nsleep_restart)) |