diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2007-10-18 03:05:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-18 14:37:23 -0700 |
| commit | 35834ca1e4bda56d252aa2024a283d631f0e5ac6 (patch) | |
| tree | 4f73a27db7de4ced7b39907fe958498a3ff7ef4b /kernel | |
| 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')
| -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[]; static struct ctl_table debug_table[]; static struct ctl_table dev_table[]; extern struct ctl_table random_table[]; -#ifdef CONFIG_UNIX98_PTYS -extern struct ctl_table pty_table[]; -#endif #ifdef CONFIG_INOTIFY_USER extern struct ctl_table inotify_table[]; #endif @@ -534,14 +531,6 @@ static struct ctl_table kern_table[] = { .mode = 0555, .child = random_table, }, -#ifdef CONFIG_UNIX98_PTYS - { - .ctl_name = KERN_PTY, - .procname = "pty", - .mode = 0555, - .child = pty_table, - }, -#endif { .ctl_name = KERN_OVERFLOWUID, .procname = "overflowuid", |