summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-08-04 15:32:08 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-08-04 15:32:08 -0700
commit7193675dc8ffa0325d013602d2bbccc0954db502 (patch)
tree92c5ab7f2ae95e9e4f103a73b07d2e02d4c87042 /kernel
parent9c66812b6bee225950431de51dfc9dc664905038 (diff)
parent70d715fd0597f18528f389b5ac59102263067744 (diff)
downloadop-kernel-dev-7193675dc8ffa0325d013602d2bbccc0954db502.zip
op-kernel-dev-7193675dc8ffa0325d013602d2bbccc0954db502.tar.gz
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
Diffstat (limited to 'kernel')
-rw-r--r--kernel/posix-timers.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c
index 052ec4d..d089d05 100644
--- a/kernel/posix-timers.c
+++ b/kernel/posix-timers.c
@@ -202,6 +202,12 @@ static int no_timer_create(struct k_itimer *new_timer)
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.
*/
@@ -254,6 +260,7 @@ static __init int init_posix_timers(void)
.clock_get = posix_get_monotonic_raw,
.clock_set = do_posix_clock_nosettime,
.timer_create = no_timer_create,
+ .nsleep = no_nsleep,
};
register_posix_clock(CLOCK_REALTIME, &clock_realtime);
OpenPOWER on IntegriCloud