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/itimer.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/itimer.c')
| -rw-r--r-- | kernel/itimer.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/kernel/itimer.c b/kernel/itimer.c index db7c358b9a02..6a5fe93dd8bd 100644 --- a/kernel/itimer.c +++ b/kernel/itimer.c @@ -100,7 +100,7 @@ int do_getitimer(int which, struct itimerval *value) return 0; } -asmlinkage long sys_getitimer(int which, struct itimerval __user *value) +SYSCALL_DEFINE2(getitimer, int, which, struct itimerval __user *, value) { int error = -EFAULT; struct itimerval get_buffer; @@ -260,9 +260,8 @@ unsigned int alarm_setitimer(unsigned int seconds) return it_old.it_value.tv_sec; } -asmlinkage long sys_setitimer(int which, - struct itimerval __user *value, - struct itimerval __user *ovalue) +SYSCALL_DEFINE3(setitimer, int, which, struct itimerval __user *, value, + struct itimerval __user *, ovalue) { struct itimerval set_buffer, get_buffer; int error; |