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

+7
+7
kernel/posix-timers.c
··· 202 202 return -EOPNOTSUPP; 203 203 } 204 204 205 + static int no_nsleep(const clockid_t which_clock, int flags, 206 + struct timespec *tsave, struct timespec __user *rmtp) 207 + { 208 + return -EOPNOTSUPP; 209 + } 210 + 205 211 /* 206 212 * Return nonzero if we know a priori this clockid_t value is bogus. 207 213 */ ··· 260 254 .clock_get = posix_get_monotonic_raw, 261 255 .clock_set = do_posix_clock_nosettime, 262 256 .timer_create = no_timer_create, 257 + .nsleep = no_nsleep, 263 258 }; 264 259 265 260 register_posix_clock(CLOCK_REALTIME, &clock_realtime);