Commit 7193675d authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'timers-fixes-for-linus' of...

Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  posix-timers: Fix oops in clock_nanosleep() with CLOCK_MONOTONIC_RAW
parents 9c66812b 70d715fd
...@@ -202,6 +202,12 @@ static int no_timer_create(struct k_itimer *new_timer) ...@@ -202,6 +202,12 @@ static int no_timer_create(struct k_itimer *new_timer)
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
static int no_nsleep(const clockid_t which_clock, int flags,
struct timespec *tsave, struct timespec __user *rmtp)
{
return -EOPNOTSUPP;
}
/* /*
* Return nonzero if we know a priori this clockid_t value is bogus. * Return nonzero if we know a priori this clockid_t value is bogus.
*/ */
...@@ -254,6 +260,7 @@ static __init int init_posix_timers(void) ...@@ -254,6 +260,7 @@ static __init int init_posix_timers(void)
.clock_get = posix_get_monotonic_raw, .clock_get = posix_get_monotonic_raw,
.clock_set = do_posix_clock_nosettime, .clock_set = do_posix_clock_nosettime,
.timer_create = no_timer_create, .timer_create = no_timer_create,
.nsleep = no_nsleep,
}; };
register_posix_clock(CLOCK_REALTIME, &clock_realtime); register_posix_clock(CLOCK_REALTIME, &clock_realtime);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment