From 787bf8be24a34b11fcbf2c2bd513828b166823b1 Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Thu, 19 Oct 2006 23:28:34 -0700 Subject: [PATCH] --- yaml --- r: 39973 b: refs/heads/master c: d6f8ff7381501887233666b508b9eac70143303d h: refs/heads/master i: 39971: 0a9adade87b1dad290c21fed11b6aed39a8bd8bf v: v3 --- [refs] | 2 +- trunk/kernel/sysctl.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index bd0910c568fa..d8ff6e5a8feb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8c7c7c9bf39470c9689ad43cae3142cf948f4cfb +refs/heads/master: d6f8ff7381501887233666b508b9eac70143303d diff --git a/trunk/kernel/sysctl.c b/trunk/kernel/sysctl.c index 8020fb273c4f..8bff2c18fb5a 100644 --- a/trunk/kernel/sysctl.c +++ b/trunk/kernel/sysctl.c @@ -136,8 +136,10 @@ static int parse_table(int __user *, int, void __user *, size_t __user *, static int proc_do_uts_string(ctl_table *table, int write, struct file *filp, void __user *buffer, size_t *lenp, loff_t *ppos); +#ifdef CONFIG_PROC_SYSCTL static int proc_do_cad_pid(ctl_table *table, int write, struct file *filp, void __user *buffer, size_t *lenp, loff_t *ppos); +#endif static ctl_table root_table[]; static struct ctl_table_header root_table_header = @@ -542,6 +544,7 @@ static ctl_table kern_table[] = { .proc_handler = &proc_dointvec, }, #endif +#ifdef CONFIG_PROC_SYSCTL { .ctl_name = KERN_CADPID, .procname = "cad_pid", @@ -550,6 +553,7 @@ static ctl_table kern_table[] = { .mode = 0600, .proc_handler = &proc_do_cad_pid, }, +#endif { .ctl_name = KERN_MAX_THREADS, .procname = "threads-max",