From: Greg Kroah-Hartman Date: Sat, 22 Feb 2014 18:31:40 +0000 (-0800) Subject: delete tty-set-correct-tty-name-in-active-sysfs-attribute.patch X-Git-Tag: v3.4.82~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=adf2f17263211ee881c450b8227b7e374df49862;p=thirdparty%2Fkernel%2Fstable-queue.git delete tty-set-correct-tty-name-in-active-sysfs-attribute.patch From 3.10, 3.12, and 3.13 kernels --- diff --git a/queue-3.10/series b/queue-3.10/series index 81670a14845..673809aaf75 100644 --- a/queue-3.10/series +++ b/queue-3.10/series @@ -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 index edf971a240a..00000000000 --- a/queue-3.10/tty-set-correct-tty-name-in-active-sysfs-attribute.patch +++ /dev/null @@ -1,91 +0,0 @@ -From d8a5dc3033af2fd6d16030d2ee4fbd073460fe54 Mon Sep 17 00:00:00 2001 -From: Hannes Reinecke -Date: Fri, 7 Feb 2014 11:38:30 +0100 -Subject: tty: Set correct tty name in 'active' sysfs attribute - -From: Hannes Reinecke - -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 -Cc: Kay Sievers -Cc: Jiri Slaby -Cc: David Herrmann -Signed-off-by: Werner Fink -Signed-off-by: Hannes Reinecke -Signed-off-by: Greg Kroah-Hartman - ---- - 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 - 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; diff --git a/queue-3.12/series b/queue-3.12/series index 8687a99a53a..8c20198f7d1 100644 --- a/queue-3.12/series +++ b/queue-3.12/series @@ -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 index 54582fa8b48..00000000000 --- a/queue-3.12/tty-set-correct-tty-name-in-active-sysfs-attribute.patch +++ /dev/null @@ -1,91 +0,0 @@ -From d8a5dc3033af2fd6d16030d2ee4fbd073460fe54 Mon Sep 17 00:00:00 2001 -From: Hannes Reinecke -Date: Fri, 7 Feb 2014 11:38:30 +0100 -Subject: tty: Set correct tty name in 'active' sysfs attribute - -From: Hannes Reinecke - -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 -Cc: Kay Sievers -Cc: Jiri Slaby -Cc: David Herrmann -Signed-off-by: Werner Fink -Signed-off-by: Hannes Reinecke -Signed-off-by: Greg Kroah-Hartman - ---- - 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 - 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; diff --git a/queue-3.13/series b/queue-3.13/series index 0dda814de0e..c89a8a002c9 100644 --- a/queue-3.13/series +++ b/queue-3.13/series @@ -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 index 54582fa8b48..00000000000 --- a/queue-3.13/tty-set-correct-tty-name-in-active-sysfs-attribute.patch +++ /dev/null @@ -1,91 +0,0 @@ -From d8a5dc3033af2fd6d16030d2ee4fbd073460fe54 Mon Sep 17 00:00:00 2001 -From: Hannes Reinecke -Date: Fri, 7 Feb 2014 11:38:30 +0100 -Subject: tty: Set correct tty name in 'active' sysfs attribute - -From: Hannes Reinecke - -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 -Cc: Kay Sievers -Cc: Jiri Slaby -Cc: David Herrmann -Signed-off-by: Werner Fink -Signed-off-by: Hannes Reinecke -Signed-off-by: Greg Kroah-Hartman - ---- - 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 - 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;