Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[~andy/linux] / kernel / timer.c

diff --git a/kernel/timer.c b/kernel/timer.c
index 14a51530a4cda8fe3a7762f7408a633aec0d780c..13dd64fe143db216a31e750d66bb29d07c932ba3 100644 (file)
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -1400,7 +1400,7 @@ out:
        return 0;
 }
 
-asmlinkage long sys_sysinfo(struct sysinfo __user *info)
+SYSCALL_DEFINE1(sysinfo, struct sysinfo __user *, info)
 {
        struct sysinfo val;