diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-01-21 15:37:27 (GMT) |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-21 15:37:27 (GMT) |
commit | 77835492ed489c0b870f82f4c50687bd267acc0a (patch) | |
tree | d80903ce1b8dd30aa44ccfc756616ad4d6c74d63 /fs/filesystems.c | |
parent | af37501c792107c2bde1524bdae38d9a247b841a (diff) | |
parent | 1de9e8e70f5acc441550ca75433563d91b269bbe (diff) | |
download | linux-fsl-qoriq-77835492ed489c0b870f82f4c50687bd267acc0a.tar.xz |
Merge commit 'v2.6.29-rc2' into perfcounters/core
Conflicts:
include/linux/syscalls.h
Diffstat (limited to 'fs/filesystems.c')
-rw-r--r-- | fs/filesystems.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/filesystems.c b/fs/filesystems.c index d488dcd..1aa7026 100644 --- a/fs/filesystems.c +++ b/fs/filesystems.c @@ -179,7 +179,7 @@ static int fs_maxindex(void) /* * Whee.. Weird sysv syscall. */ -asmlinkage long sys_sysfs(int option, unsigned long arg1, unsigned long arg2) +SYSCALL_DEFINE3(sysfs, int, option, unsigned long, arg1, unsigned long, arg2) { int retval = -EINVAL; |