diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2007-10-18 06:05:31 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-18 17:37:23 -0400 |
commit | 35834ca1e4bda56d252aa2024a283d631f0e5ac6 (patch) | |
tree | 4f73a27db7de4ced7b39907fe958498a3ff7ef4b /kernel/sysctl.c | |
parent | 25398a158d86b993fa5bf36f5a6752134b584d60 (diff) |
sysctl: simplify the pty sysctl logic
Instead of having a bunch of ifdefs in sysctl.c move all of the pty sysctl
logic into drivers/char/pty.c
As well as cleaning up the logic this prevents sysctl_check_table from
complaining that the root table has a NULL data pointer on something with
generic methods.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/sysctl.c')
-rw-r--r-- | kernel/sysctl.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index bed6cdb3e47a..0278f52c4b04 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
@@ -163,9 +163,6 @@ static struct ctl_table fs_table[]; | |||
163 | static struct ctl_table debug_table[]; | 163 | static struct ctl_table debug_table[]; |
164 | static struct ctl_table dev_table[]; | 164 | static struct ctl_table dev_table[]; |
165 | extern struct ctl_table random_table[]; | 165 | extern struct ctl_table random_table[]; |
166 | #ifdef CONFIG_UNIX98_PTYS | ||
167 | extern struct ctl_table pty_table[]; | ||
168 | #endif | ||
169 | #ifdef CONFIG_INOTIFY_USER | 166 | #ifdef CONFIG_INOTIFY_USER |
170 | extern struct ctl_table inotify_table[]; | 167 | extern struct ctl_table inotify_table[]; |
171 | #endif | 168 | #endif |
@@ -534,14 +531,6 @@ static struct ctl_table kern_table[] = { | |||
534 | .mode = 0555, | 531 | .mode = 0555, |
535 | .child = random_table, | 532 | .child = random_table, |
536 | }, | 533 | }, |
537 | #ifdef CONFIG_UNIX98_PTYS | ||
538 | { | ||
539 | .ctl_name = KERN_PTY, | ||
540 | .procname = "pty", | ||
541 | .mode = 0555, | ||
542 | .child = pty_table, | ||
543 | }, | ||
544 | #endif | ||
545 | { | 534 | { |
546 | .ctl_name = KERN_OVERFLOWUID, | 535 | .ctl_name = KERN_OVERFLOWUID, |
547 | .procname = "overflowuid", | 536 | .procname = "overflowuid", |