Merge branch 'master' of /home/shaggy/git/linus-clean/

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;