diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-04 14:54:56 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-04 14:54:56 +0100 |
| commit | bb960a1e42042e82447a5bc0941b3ab6d614bac3 (patch) | |
| tree | d2295a923fabb1b01b25bb015c4c2e42ee9df5ca /kernel/itimer.c | |
| parent | 858770619debfb9269add63e4ba8b7c6b5538dd1 (diff) | |
| parent | 06fc732c33a7ff5e4c91bcf4a6ca86b5e335ad9a (diff) | |
| download | kernel-crypto-bb960a1e42042e82447a5bc0941b3ab6d614bac3.tar.gz kernel-crypto-bb960a1e42042e82447a5bc0941b3ab6d614bac3.tar.xz kernel-crypto-bb960a1e42042e82447a5bc0941b3ab6d614bac3.zip | |
Merge branch 'core/xen' into x86/urgent
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 db7c358b9a0..6a5fe93dd8b 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; |