]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
delete tty-set-correct-tty-name-in-active-sysfs-attribute.patch
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 22 Feb 2014 18:31:40 +0000 (10:31 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 22 Feb 2014 18:31:40 +0000 (10:31 -0800)
From 3.10, 3.12, and 3.13 kernels

queue-3.10/series
queue-3.10/tty-set-correct-tty-name-in-active-sysfs-attribute.patch [deleted file]
queue-3.12/series
queue-3.12/tty-set-correct-tty-name-in-active-sysfs-attribute.patch [deleted file]
queue-3.13/series
queue-3.13/tty-set-correct-tty-name-in-active-sysfs-attribute.patch [deleted file]

index 81670a14845975aaf0287ffae5f8c919217ba2f7..673809aaf754329b4dd95a7e766ab46cff3ef5d2 100644 (file)
@@ -22,7 +22,6 @@ raw-test-against-runtime-value-of-max_raw_minors.patch
 hwmon-ntc_thermistor-avoid-math-overflow.patch
 lockd-send-correct-lock-when-granting-a-delayed-lock.patch
 tty-n_gsm-fix-for-modems-with-brk-in-modem-status-control.patch
-tty-set-correct-tty-name-in-active-sysfs-attribute.patch
 drm-radeon-fix-uvd-irq-support-on-7xx.patch
 drm-radeon-fix-uvd-irq-support-on-si.patch
 vt-fix-secure-clear-screen.patch
diff --git a/queue-3.10/tty-set-correct-tty-name-in-active-sysfs-attribute.patch b/queue-3.10/tty-set-correct-tty-name-in-active-sysfs-attribute.patch
deleted file mode 100644 (file)
index edf971a..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-From d8a5dc3033af2fd6d16030d2ee4fbd073460fe54 Mon Sep 17 00:00:00 2001
-From: Hannes Reinecke <hare@suse.de>
-Date: Fri, 7 Feb 2014 11:38:30 +0100
-Subject: tty: Set correct tty name in 'active' sysfs attribute
-
-From: Hannes Reinecke <hare@suse.de>
-
-commit d8a5dc3033af2fd6d16030d2ee4fbd073460fe54 upstream.
-
-The 'active' sysfs attribute should refer to the currently active tty
-devices the console is running on, not the currently active console.
-
-The console structure doesn't refer to any device in sysfs, only the tty
-the console is running on has.  So we need to print out the tty names in
-'active', not the console names.
-
-This resolves an issue on s390 platforms in determining the correct
-console device to use.
-
-Cc: Lennart Poettering <lennart@poettering.net>
-Cc: Kay Sievers <kay@vrfy.org>
-Cc: Jiri Slaby <jslaby@suse.cz>
-Cc: David Herrmann <dh.herrmann@gmail.com>
-Signed-off-by: Werner Fink <werner@suse.de>
-Signed-off-by: Hannes Reinecke <hare@suse.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- Documentation/ABI/testing/sysfs-tty |    3 ++-
- drivers/tty/tty_io.c                |   25 ++++++++++++++++++-------
- 2 files changed, 20 insertions(+), 8 deletions(-)
-
---- a/Documentation/ABI/testing/sysfs-tty
-+++ b/Documentation/ABI/testing/sysfs-tty
-@@ -3,7 +3,8 @@ Date:          Nov 2010
- Contact:      Kay Sievers <kay.sievers@vrfy.org>
- Description:
-                Shows the list of currently configured
--               console devices, like 'tty1 ttyS0'.
-+               tty devices used for the console,
-+               like 'tty1 ttyS0'.
-                The last entry in the file is the active
-                device connected to /dev/console.
-                The file supports poll() to detect virtual
---- a/drivers/tty/tty_io.c
-+++ b/drivers/tty/tty_io.c
-@@ -1263,16 +1263,17 @@ static void pty_line_name(struct tty_dri
-  *    @p: output buffer of at least 7 bytes
-  *
-  *    Generate a name from a driver reference and write it to the output
-- *    buffer.
-+ *    buffer. Return the number of bytes written.
-  *
-  *    Locking: None
-  */
--static void tty_line_name(struct tty_driver *driver, int index, char *p)
-+static ssize_t tty_line_name(struct tty_driver *driver, int index, char *p)
- {
-       if (driver->flags & TTY_DRIVER_UNNUMBERED_NODE)
--              strcpy(p, driver->name);
-+              return sprintf(p, "%s", driver->name);
-       else
--              sprintf(p, "%s%d", driver->name, index + driver->name_base);
-+              return sprintf(p, "%s%d", driver->name,
-+                             index + driver->name_base);
- }
- /**
-@@ -3538,9 +3539,19 @@ static ssize_t show_cons_active(struct d
-               if (i >= ARRAY_SIZE(cs))
-                       break;
-       }
--      while (i--)
--              count += sprintf(buf + count, "%s%d%c",
--                               cs[i]->name, cs[i]->index, i ? ' ':'\n');
-+      while (i--) {
-+              struct tty_driver *driver;
-+              const char *name = cs[i]->name;
-+              int index = cs[i]->index;
-+
-+              driver = cs[i]->device(cs[i], &index);
-+              if (driver) {
-+                      count += tty_line_name(driver, index, buf + count);
-+                      count += sprintf(buf + count, "%c", i ? ' ':'\n');
-+              } else
-+                      count += sprintf(buf + count, "%s%d%c",
-+                                       name, index, i ? ' ':'\n');
-+      }
-       console_unlock();
-       return count;
index 8687a99a53a05503b777b1135992ec7fd7b753ea..8c20198f7d1e7239941ead16c6b03eb019277f34 100644 (file)
@@ -27,7 +27,6 @@ raw-test-against-runtime-value-of-max_raw_minors.patch
 hwmon-ntc_thermistor-avoid-math-overflow.patch
 lockd-send-correct-lock-when-granting-a-delayed-lock.patch
 tty-n_gsm-fix-for-modems-with-brk-in-modem-status-control.patch
-tty-set-correct-tty-name-in-active-sysfs-attribute.patch
 drm-radeon-fix-uvd-irq-support-on-7xx.patch
 drm-radeon-fix-uvd-irq-support-on-si.patch
 drm-i915-pair-va_copy-with-va_end-in-i915_error_vprintf.patch
diff --git a/queue-3.12/tty-set-correct-tty-name-in-active-sysfs-attribute.patch b/queue-3.12/tty-set-correct-tty-name-in-active-sysfs-attribute.patch
deleted file mode 100644 (file)
index 54582fa..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-From d8a5dc3033af2fd6d16030d2ee4fbd073460fe54 Mon Sep 17 00:00:00 2001
-From: Hannes Reinecke <hare@suse.de>
-Date: Fri, 7 Feb 2014 11:38:30 +0100
-Subject: tty: Set correct tty name in 'active' sysfs attribute
-
-From: Hannes Reinecke <hare@suse.de>
-
-commit d8a5dc3033af2fd6d16030d2ee4fbd073460fe54 upstream.
-
-The 'active' sysfs attribute should refer to the currently active tty
-devices the console is running on, not the currently active console.
-
-The console structure doesn't refer to any device in sysfs, only the tty
-the console is running on has.  So we need to print out the tty names in
-'active', not the console names.
-
-This resolves an issue on s390 platforms in determining the correct
-console device to use.
-
-Cc: Lennart Poettering <lennart@poettering.net>
-Cc: Kay Sievers <kay@vrfy.org>
-Cc: Jiri Slaby <jslaby@suse.cz>
-Cc: David Herrmann <dh.herrmann@gmail.com>
-Signed-off-by: Werner Fink <werner@suse.de>
-Signed-off-by: Hannes Reinecke <hare@suse.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- Documentation/ABI/testing/sysfs-tty |    3 ++-
- drivers/tty/tty_io.c                |   25 ++++++++++++++++++-------
- 2 files changed, 20 insertions(+), 8 deletions(-)
-
---- a/Documentation/ABI/testing/sysfs-tty
-+++ b/Documentation/ABI/testing/sysfs-tty
-@@ -3,7 +3,8 @@ Date:          Nov 2010
- Contact:      Kay Sievers <kay.sievers@vrfy.org>
- Description:
-                Shows the list of currently configured
--               console devices, like 'tty1 ttyS0'.
-+               tty devices used for the console,
-+               like 'tty1 ttyS0'.
-                The last entry in the file is the active
-                device connected to /dev/console.
-                The file supports poll() to detect virtual
---- a/drivers/tty/tty_io.c
-+++ b/drivers/tty/tty_io.c
-@@ -1267,16 +1267,17 @@ static void pty_line_name(struct tty_dri
-  *    @p: output buffer of at least 7 bytes
-  *
-  *    Generate a name from a driver reference and write it to the output
-- *    buffer.
-+ *    buffer. Return the number of bytes written.
-  *
-  *    Locking: None
-  */
--static void tty_line_name(struct tty_driver *driver, int index, char *p)
-+static ssize_t tty_line_name(struct tty_driver *driver, int index, char *p)
- {
-       if (driver->flags & TTY_DRIVER_UNNUMBERED_NODE)
--              strcpy(p, driver->name);
-+              return sprintf(p, "%s", driver->name);
-       else
--              sprintf(p, "%s%d", driver->name, index + driver->name_base);
-+              return sprintf(p, "%s%d", driver->name,
-+                             index + driver->name_base);
- }
- /**
-@@ -3545,9 +3546,19 @@ static ssize_t show_cons_active(struct d
-               if (i >= ARRAY_SIZE(cs))
-                       break;
-       }
--      while (i--)
--              count += sprintf(buf + count, "%s%d%c",
--                               cs[i]->name, cs[i]->index, i ? ' ':'\n');
-+      while (i--) {
-+              struct tty_driver *driver;
-+              const char *name = cs[i]->name;
-+              int index = cs[i]->index;
-+
-+              driver = cs[i]->device(cs[i], &index);
-+              if (driver) {
-+                      count += tty_line_name(driver, index, buf + count);
-+                      count += sprintf(buf + count, "%c", i ? ' ':'\n');
-+              } else
-+                      count += sprintf(buf + count, "%s%d%c",
-+                                       name, index, i ? ' ':'\n');
-+      }
-       console_unlock();
-       return count;
index 0dda814de0e32ca40876fb5221e0390789e66b92..c89a8a002c9140eebc76ce7876fd8434630f76e4 100644 (file)
@@ -32,7 +32,6 @@ raw-test-against-runtime-value-of-max_raw_minors.patch
 hwmon-ntc_thermistor-avoid-math-overflow.patch
 lockd-send-correct-lock-when-granting-a-delayed-lock.patch
 tty-n_gsm-fix-for-modems-with-brk-in-modem-status-control.patch
-tty-set-correct-tty-name-in-active-sysfs-attribute.patch
 n_tty-fix-stale-echo-output.patch
 drm-radeon-fix-uvd-irq-support-on-7xx.patch
 drm-radeon-fix-uvd-irq-support-on-si.patch
diff --git a/queue-3.13/tty-set-correct-tty-name-in-active-sysfs-attribute.patch b/queue-3.13/tty-set-correct-tty-name-in-active-sysfs-attribute.patch
deleted file mode 100644 (file)
index 54582fa..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-From d8a5dc3033af2fd6d16030d2ee4fbd073460fe54 Mon Sep 17 00:00:00 2001
-From: Hannes Reinecke <hare@suse.de>
-Date: Fri, 7 Feb 2014 11:38:30 +0100
-Subject: tty: Set correct tty name in 'active' sysfs attribute
-
-From: Hannes Reinecke <hare@suse.de>
-
-commit d8a5dc3033af2fd6d16030d2ee4fbd073460fe54 upstream.
-
-The 'active' sysfs attribute should refer to the currently active tty
-devices the console is running on, not the currently active console.
-
-The console structure doesn't refer to any device in sysfs, only the tty
-the console is running on has.  So we need to print out the tty names in
-'active', not the console names.
-
-This resolves an issue on s390 platforms in determining the correct
-console device to use.
-
-Cc: Lennart Poettering <lennart@poettering.net>
-Cc: Kay Sievers <kay@vrfy.org>
-Cc: Jiri Slaby <jslaby@suse.cz>
-Cc: David Herrmann <dh.herrmann@gmail.com>
-Signed-off-by: Werner Fink <werner@suse.de>
-Signed-off-by: Hannes Reinecke <hare@suse.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- Documentation/ABI/testing/sysfs-tty |    3 ++-
- drivers/tty/tty_io.c                |   25 ++++++++++++++++++-------
- 2 files changed, 20 insertions(+), 8 deletions(-)
-
---- a/Documentation/ABI/testing/sysfs-tty
-+++ b/Documentation/ABI/testing/sysfs-tty
-@@ -3,7 +3,8 @@ Date:          Nov 2010
- Contact:      Kay Sievers <kay.sievers@vrfy.org>
- Description:
-                Shows the list of currently configured
--               console devices, like 'tty1 ttyS0'.
-+               tty devices used for the console,
-+               like 'tty1 ttyS0'.
-                The last entry in the file is the active
-                device connected to /dev/console.
-                The file supports poll() to detect virtual
---- a/drivers/tty/tty_io.c
-+++ b/drivers/tty/tty_io.c
-@@ -1267,16 +1267,17 @@ static void pty_line_name(struct tty_dri
-  *    @p: output buffer of at least 7 bytes
-  *
-  *    Generate a name from a driver reference and write it to the output
-- *    buffer.
-+ *    buffer. Return the number of bytes written.
-  *
-  *    Locking: None
-  */
--static void tty_line_name(struct tty_driver *driver, int index, char *p)
-+static ssize_t tty_line_name(struct tty_driver *driver, int index, char *p)
- {
-       if (driver->flags & TTY_DRIVER_UNNUMBERED_NODE)
--              strcpy(p, driver->name);
-+              return sprintf(p, "%s", driver->name);
-       else
--              sprintf(p, "%s%d", driver->name, index + driver->name_base);
-+              return sprintf(p, "%s%d", driver->name,
-+                             index + driver->name_base);
- }
- /**
-@@ -3545,9 +3546,19 @@ static ssize_t show_cons_active(struct d
-               if (i >= ARRAY_SIZE(cs))
-                       break;
-       }
--      while (i--)
--              count += sprintf(buf + count, "%s%d%c",
--                               cs[i]->name, cs[i]->index, i ? ' ':'\n');
-+      while (i--) {
-+              struct tty_driver *driver;
-+              const char *name = cs[i]->name;
-+              int index = cs[i]->index;
-+
-+              driver = cs[i]->device(cs[i], &index);
-+              if (driver) {
-+                      count += tty_line_name(driver, index, buf + count);
-+                      count += sprintf(buf + count, "%c", i ? ' ':'\n');
-+              } else
-+                      count += sprintf(buf + count, "%s%d%c",
-+                                       name, index, i ? ' ':'\n');
-+      }
-       console_unlock();
-       return count;