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>
This commit is contained in:
committed by
Linus Torvalds
parent
25398a158d
commit
35834ca1e4
@@ -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",
|
||||
|
||||
Reference in New Issue
Block a user