Просмотр исходного кода

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
Linus Torvalds 16 лет назад
Родитель
Сommit
7193675dc8
1 измененных файлов с 7 добавлено и 0 удалено
  1. 7 0
      kernel/posix-timers.c

+ 7 - 0
kernel/posix-timers.c

@@ -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)
 		.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);