diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-01-25 05:54:33 -0500 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-01-25 05:54:33 -0500 |
| commit | 5b74f9e0e005baf12a2df6aaeef7d7134137792b (patch) | |
| tree | d3cef2c8c91fb415533e028bf55cc348d8818431 /kernel/hrtimer.c | |
| parent | e3ee1e123183ca9847e74b7b8e2694c9e3b817a6 (diff) | |
| parent | f3b8436ad9a8ad36b3c9fa1fe030c7f38e5d3d0b (diff) | |
Merge branch 'linus' into timers/hrtimers
Diffstat (limited to 'kernel/hrtimer.c')
| -rw-r--r-- | kernel/hrtimer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index 77aa33bb877c..2c40ee8f44bd 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c | |||
| @@ -1495,8 +1495,8 @@ out: | |||
| 1495 | return ret; | 1495 | return ret; |
| 1496 | } | 1496 | } |
| 1497 | 1497 | ||
| 1498 | asmlinkage long | 1498 | SYSCALL_DEFINE2(nanosleep, struct timespec __user *, rqtp, |
| 1499 | sys_nanosleep(struct timespec __user *rqtp, struct timespec __user *rmtp) | 1499 | struct timespec __user *, rmtp) |
| 1500 | { | 1500 | { |
| 1501 | struct timespec tu; | 1501 | struct timespec tu; |
| 1502 | 1502 | ||