Merge branches 'pm-cpufreq' and 'acpi-cppc'

[mirror_ubuntu-artful-kernel.git] / fs / proc / proc_tty.c

diff --git a/fs/proc/proc_tty.c b/fs/proc/proc_tty.c
index cb761f01030028db501075eeadd71da259697b15..15f327bed8c6fea9ccdba944b3540524b6c6d065 100644 (file)
--- a/fs/proc/proc_tty.c
+++ b/fs/proc/proc_tty.c
@@ -18,7 +18,7 @@
 /*
  * The /proc/tty directory inodes...
  */
-static struct proc_dir_entry *proc_tty_ldisc, *proc_tty_driver;
+static struct proc_dir_entry *proc_tty_driver;
 
 /*
  * This is the handler for /proc/tty/drivers
@@ -176,7 +176,7 @@ void __init proc_tty_init(void)
 {
        if (!proc_mkdir("tty", NULL))
                return;
-       proc_tty_ldisc = proc_mkdir("tty/ldisc", NULL);
+       proc_mkdir("tty/ldisc", NULL);  /* Preserved: it's userspace visible */
        /*
         * /proc/tty/driver/serial reveals the exact character counts for
         * serial links which is just too easy to abuse for inferring