diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-18 15:12:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-18 15:12:41 -0700 |
| commit | 58f9b52ee8712283f7ffedb661df678c61e88a91 (patch) | |
| tree | fe6d2e1bca6befd8ca347487a7c053b8136320ad /include | |
| parent | 2af170dd241810212cbdbdc802ba7d39e3fb23b9 (diff) | |
| parent | c70878b4e0b6cf8d2f1e46319e48e821ef4a8aba (diff) | |
| download | linux-58f9b52ee8712283f7ffedb661df678c61e88a91.tar.gz linux-58f9b52ee8712283f7ffedb661df678c61e88a91.tar.bz2 linux-58f9b52ee8712283f7ffedb661df678c61e88a91.zip | |
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')
| -rw-r--r-- | include/linux/hrtimer.h | 2 |
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); /* Precise sleep: */ extern long hrtimer_nanosleep(struct timespec *rqtp, - struct timespec __user *rmtp, + struct timespec *rmtp, const enum hrtimer_mode mode, const clockid_t clockid); extern long hrtimer_nanosleep_restart(struct restart_block *restart_block); |