Merge commit 'v2.6.30-rc1' into sched/urgent

[safe/jmp/linux-2.6] / kernel / acct.c

diff --git a/kernel/acct.c b/kernel/acct.c
index d57b7cb..7afa315 100644 (file)
--- a/kernel/acct.c
+++ b/kernel/acct.c
@@ -277,7 +277,7 @@ static int acct_on(char *name)
  * should be written. If the filename is NULL, accounting will be
  * shutdown.
  */
-asmlinkage long sys_acct(const char __user *name)
+SYSCALL_DEFINE1(acct, const char __user *, name)
 {
        int error;