diff options
author | Randy Dunlap <randy.dunlap@oracle.com> | 2006-10-20 02:28:34 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-20 13:26:38 -0400 |
commit | d6f8ff7381501887233666b508b9eac70143303d (patch) | |
tree | 9204da43ac464a0ca3b064693cb3a6a10e574575 | |
parent | 8c7c7c9bf39470c9689ad43cae3142cf948f4cfb (diff) |
[PATCH] cad_pid sysctl with PROC_FS=n
If CONFIG_PROC_FS=n:
kernel/sysctl.c:148: warning: 'proc_do_cad_pid' used but never defined
kernel/built-in.o:(.data+0x1228): undefined reference to `proc_do_cad_pid'
make: *** [.tmp_vmlinux1] Error 1
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | kernel/sysctl.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 8020fb273c4f..8bff2c18fb5a 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
@@ -136,8 +136,10 @@ static int parse_table(int __user *, int, void __user *, size_t __user *, | |||
136 | static int proc_do_uts_string(ctl_table *table, int write, struct file *filp, | 136 | static int proc_do_uts_string(ctl_table *table, int write, struct file *filp, |
137 | void __user *buffer, size_t *lenp, loff_t *ppos); | 137 | void __user *buffer, size_t *lenp, loff_t *ppos); |
138 | 138 | ||
139 | #ifdef CONFIG_PROC_SYSCTL | ||
139 | static int proc_do_cad_pid(ctl_table *table, int write, struct file *filp, | 140 | static int proc_do_cad_pid(ctl_table *table, int write, struct file *filp, |
140 | void __user *buffer, size_t *lenp, loff_t *ppos); | 141 | void __user *buffer, size_t *lenp, loff_t *ppos); |
142 | #endif | ||
141 | 143 | ||
142 | static ctl_table root_table[]; | 144 | static ctl_table root_table[]; |
143 | static struct ctl_table_header root_table_header = | 145 | static struct ctl_table_header root_table_header = |
@@ -542,6 +544,7 @@ static ctl_table kern_table[] = { | |||
542 | .proc_handler = &proc_dointvec, | 544 | .proc_handler = &proc_dointvec, |
543 | }, | 545 | }, |
544 | #endif | 546 | #endif |
547 | #ifdef CONFIG_PROC_SYSCTL | ||
545 | { | 548 | { |
546 | .ctl_name = KERN_CADPID, | 549 | .ctl_name = KERN_CADPID, |
547 | .procname = "cad_pid", | 550 | .procname = "cad_pid", |
@@ -550,6 +553,7 @@ static ctl_table kern_table[] = { | |||
550 | .mode = 0600, | 553 | .mode = 0600, |
551 | .proc_handler = &proc_do_cad_pid, | 554 | .proc_handler = &proc_do_cad_pid, |
552 | }, | 555 | }, |
556 | #endif | ||
553 | { | 557 | { |
554 | .ctl_name = KERN_MAX_THREADS, | 558 | .ctl_name = KERN_MAX_THREADS, |
555 | .procname = "threads-max", | 559 | .procname = "threads-max", |