Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0f13bd4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'tty-3.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty 

Pull TTY revert from Greg KH:
 "Here is a single commit, a revert of a sysfs file change that ended up
  breaking a userspace tool"

* tag 'tty-3.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  Revert "tty: Set correct tty name in 'active' sysfs attribute"
parents b9c2b050 5c0a2450

Documentation/ABI/testing/sysfs-tty

+1 −2
Original line number Original line Diff line number Diff line
@@ -3,8 +3,7 @@ Date: Nov 2010 
Contact:	Kay Sievers <kay.sievers@vrfy.org>

Contact:	Kay Sievers <kay.sievers@vrfy.org>

Description:

Description:

		 Shows the list of currently configured

		 Shows the list of currently configured

		 tty devices used for the console,

		 console devices, like 'tty1 ttyS0'.

		 like 'tty1 ttyS0'.

		 The last entry in the file is the active

		 The last entry in the file is the active

		 device connected to /dev/console.

		 device connected to /dev/console.

		 The file supports poll() to detect virtual

		 The file supports poll() to detect virtual

drivers/tty/tty_io.c

+7 −18
Original line number Original line Diff line number Diff line
@@ -1267,17 +1267,16 @@ static void pty_line_name(struct tty_driver *driver, int index, char *p) 
 *	@p: output buffer of at least 7 bytes

 *	@p: output buffer of at least 7 bytes

 *

 *

 *	Generate a name from a driver reference and write it to the output

 *	Generate a name from a driver reference and write it to the output

 *	buffer. Return the number of bytes written.

 *	buffer.

 *

 *

 *	Locking: None

 *	Locking: None

 */

 */

static ssize_t tty_line_name(struct tty_driver *driver, int index, char *p)

static void tty_line_name(struct tty_driver *driver, int index, char *p)

{

{

	if (driver->flags & TTY_DRIVER_UNNUMBERED_NODE)

	if (driver->flags & TTY_DRIVER_UNNUMBERED_NODE)

		return sprintf(p, "%s", driver->name);

		strcpy(p, driver->name);

	else

	else

		return sprintf(p, "%s%d", driver->name,

		sprintf(p, "%s%d", driver->name, index + driver->name_base);

			       index + driver->name_base);

}

}





/**

/**
@@ -3546,19 +3545,9 @@ static ssize_t show_cons_active(struct device *dev, 
		if (i >= ARRAY_SIZE(cs))

		if (i >= ARRAY_SIZE(cs))

			break;

			break;

	}

	}

	while (i--) {

	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",

		count += sprintf(buf + count, "%s%d%c",

					 name, index, i ? ' ':'\n');

				 cs[i]->name, cs[i]->index, i ? ' ':'\n');

	}

	console_unlock();

	console_unlock();





	return count;

	return count;