diff options
author | Randy Dunlap <randy.dunlap@oracle.com> | 2006-12-10 05:18:36 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-10 12:55:39 -0500 |
commit | d53ef07ab45085c0b06b652d588aa49b8ba41458 (patch) | |
tree | 6ab1e5d024da93af26b4e0b95f59dfeb127b00a8 /kernel | |
parent | 2d4ba4a3b9aef95d328d74a17ae84f8d658059e2 (diff) |
[PATCH] ipc-procfs-sysctl mixups
When CONFIG_PROC_FS=n and CONFIG_PROC_SYSCTL=n but CONFIG_SYSVIPC=y, we get
this build error:
kernel/built-in.o:(.data+0xc38): undefined reference to `proc_ipc_doulongvec_minmax'
kernel/built-in.o:(.data+0xc88): undefined reference to `proc_ipc_doulongvec_minmax'
kernel/built-in.o:(.data+0xcd8): undefined reference to `proc_ipc_dointvec'
kernel/built-in.o:(.data+0xd28): undefined reference to `proc_ipc_dointvec'
kernel/built-in.o:(.data+0xd78): undefined reference to `proc_ipc_dointvec'
kernel/built-in.o:(.data+0xdc8): undefined reference to `proc_ipc_dointvec'
kernel/built-in.o:(.data+0xe18): undefined reference to `proc_ipc_dointvec'
make: *** [vmlinux] Error 1
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Acked-by: Eric Biederman <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/sysctl.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 025fcb3c66f..1c5697e3521 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
@@ -2408,6 +2408,17 @@ static int proc_do_ipc_string(ctl_table *table, int write, struct file *filp, | |||
2408 | { | 2408 | { |
2409 | return -ENOSYS; | 2409 | return -ENOSYS; |
2410 | } | 2410 | } |
2411 | static int proc_ipc_dointvec(ctl_table *table, int write, struct file *filp, | ||
2412 | void __user *buffer, size_t *lenp, loff_t *ppos) | ||
2413 | { | ||
2414 | return -ENOSYS; | ||
2415 | } | ||
2416 | static int proc_ipc_doulongvec_minmax(ctl_table *table, int write, | ||
2417 | struct file *filp, void __user *buffer, | ||
2418 | size_t *lenp, loff_t *ppos) | ||
2419 | { | ||
2420 | return -ENOSYS; | ||
2421 | } | ||
2411 | #endif | 2422 | #endif |
2412 | 2423 | ||
2413 | int proc_dointvec(ctl_table *table, int write, struct file *filp, | 2424 | int proc_dointvec(ctl_table *table, int write, struct file *filp, |