diff options
| author |   Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2009-01-19 14:00:57 +1100 |
|---|---|---|
| committer |   Lachlan McIlroy <lachlan@sgi.com> | 2009-01-19 14:00:57 +1100 |
| commit | 6c5200ce3c528a8f7695ee62f33ad84d8f84d444 (patch) | |
| tree | b240465c2dadbe0366a5b66d60c4776be1b7670d /kernel/hrtimer.c | |
| parent | [XFS] Remove the rest of the macro-to-function indirections. (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband (diff) | |
| download | linux-dev-6c5200ce3c528a8f7695ee62f33ad84d8f84d444.tar.xz linux-dev-6c5200ce3c528a8f7695ee62f33ad84d8f84d444.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
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 1455b7651b6b..2dc30c59c5fd 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c @@ -1467,8 +1467,8 @@ out: return ret; } -asmlinkage long -sys_nanosleep(struct timespec __user *rqtp, struct timespec __user *rmtp) +SYSCALL_DEFINE2(nanosleep, struct timespec __user *, rqtp, + struct timespec __user *, rmtp) { struct timespec tu; |