aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-18 18:12:41 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-18 18:12:41 -0400
commit58f9b52ee8712283f7ffedb661df678c61e88a91 (patch)
treefe6d2e1bca6befd8ca347487a7c053b8136320ad /include/linux
parent2af170dd241810212cbdbdc802ba7d39e3fb23b9 (diff)
parentc70878b4e0b6cf8d2f1e46319e48e821ef4a8aba (diff)
Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt
* ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt: hrtimer: hook compat_sys_nanosleep up to high res timer code hrtimer: Rework hrtimer_nanosleep to make sys_compat_nanosleep easier
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/hrtimer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
index 540799bc85f8..7a9398e19704 100644
--- a/include/linux/hrtimer.h
+++ b/include/linux/hrtimer.h
@@ -300,7 +300,7 @@ hrtimer_forward(struct hrtimer *timer, ktime_t now, ktime_t interval);
300 300
301/* Precise sleep: */ 301/* Precise sleep: */
302extern long hrtimer_nanosleep(struct timespec *rqtp, 302extern long hrtimer_nanosleep(struct timespec *rqtp,
303 struct timespec __user *rmtp, 303 struct timespec *rmtp,
304 const enum hrtimer_mode mode, 304 const enum hrtimer_mode mode,
305 const clockid_t clockid); 305 const clockid_t clockid);
306extern long hrtimer_nanosleep_restart(struct restart_block *restart_block); 306extern long hrtimer_nanosleep_restart(struct restart_block *restart_block);