Commit 7fd105e7 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Linus Torvalds

[PATCH] Fix compile for CONFIG_SYSVIPC=n or CONFIG_SYSCTL=n

The compat syscalls are added to sys_ni.c since they are not defined if the
above CONFIG options are off.  Also, nfs would not build with CONFIG_SYSCTL
off.

Noticed by Arthur Othieno.
Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 7a9166e3
...@@ -398,7 +398,7 @@ extern struct inode_operations nfs_symlink_inode_operations; ...@@ -398,7 +398,7 @@ extern struct inode_operations nfs_symlink_inode_operations;
extern int nfs_register_sysctl(void); extern int nfs_register_sysctl(void);
extern void nfs_unregister_sysctl(void); extern void nfs_unregister_sysctl(void);
#else #else
#define nfs_register_sysctl() do { } while(0) #define nfs_register_sysctl() 0
#define nfs_unregister_sysctl() do { } while(0) #define nfs_unregister_sysctl() do { } while(0)
#endif #endif
......
...@@ -104,6 +104,8 @@ cond_syscall(sys_setreuid16); ...@@ -104,6 +104,8 @@ cond_syscall(sys_setreuid16);
cond_syscall(sys_setuid16); cond_syscall(sys_setuid16);
cond_syscall(sys_vm86old); cond_syscall(sys_vm86old);
cond_syscall(sys_vm86); cond_syscall(sys_vm86);
cond_syscall(compat_sys_ipc);
cond_syscall(compat_sys_sysctl);
/* arch-specific weak syscall entries */ /* arch-specific weak syscall entries */
cond_syscall(sys_pciconfig_read); cond_syscall(sys_pciconfig_read);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment