[PATCH 19/69] sysctl: remove .child from kernel/pty

Lucian Adrian Grijincu
2011-05-01T01:38:37Z

drivers/tty/pty.c | 23 +++++------------------
1 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
index 2107747..2a40b34 100644
--- a/drivers/tty/pty.c
+++ b/drivers/tty/pty.c
@@ -469,25 +469,12 @@ static struct ctl_table pty_table[] = {
{}
};

-static struct ctl_table pty_kern_table[] = {
- {
- .procname = "pty",
- .mode = 0555,
- .child = pty_table,
- },
- {}
+static const __initdata struct ctl_path pty_path[] = {
+ { .procname = "kernel" },
+ { .procname = "pty" },
+ { }
};

-static struct ctl_table pty_root_table[] = {
- {
- .procname = "kernel",
- .mode = 0555,
- .child = pty_kern_table,
- },
- {}
-};
-
-
static int pty_unix98_ioctl(struct tty_struct *tty,
unsigned int cmd, unsigned long arg)
{
@@ -750,7 +737,7 @@ static void __init unix98_pty_init(void)
if (tty_register_driver(pts_driver))
panic("Couldn't register Unix98 pts driver");

- register_sysctl_table(pty_root_table);
+ register_sysctl_paths(pty_path, pty_table);

/* Now create the /dev/ptmx special device */
tty_default_fops(&ptmx_fops);
--
1.7.5.134.g1c08b