Merge tag 'tty-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty (56edff75) · Commits · 戴 / test

Documentation/serial/driver

+0 −4

Original line number	Diff line number	Diff line
		@@ -264,10 +264,6 @@ hardware.
		Locking: none.
		Interrupts: caller dependent.

		set_wake(port,state)
		Enable/disable power management wakeup on serial activity. Not
		currently implemented.

		type(port)
		Return a pointer to a string constant describing the specified
		port, or return NULL, in which case the string 'unknown' is

Documentation/sysrq.txt

+15 −13

Original line number	Diff line number	Diff line
		@@ -11,27 +11,29 @@ regardless of whatever else it is doing, unless it is completely locked up.
		You need to say "yes" to 'Magic SysRq key (CONFIG_MAGIC_SYSRQ)' when
		configuring the kernel. When running a kernel with SysRq compiled in,
		/proc/sys/kernel/sysrq controls the functions allowed to be invoked via
		the SysRq key. By default the file contains 1 which means that every
		possible SysRq request is allowed (in older versions SysRq was disabled
		by default, and you were required to specifically enable it at run-time
		but this is not the case any more). Here is the list of possible values
		in /proc/sys/kernel/sysrq:
		the SysRq key. The default value in this file is set by the
		CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE config symbol, which itself defaults
		to 1. Here is the list of possible values in /proc/sys/kernel/sysrq:
		0 - disable sysrq completely
		1 - enable all functions of sysrq
		>1 - bitmask of allowed sysrq functions (see below for detailed function
		description):
		2 - enable control of console logging level
		4 - enable control of keyboard (SAK, unraw)
		8 - enable debugging dumps of processes etc.
		16 - enable sync command
		32 - enable remount read-only
		64 - enable signalling of processes (term, kill, oom-kill)
		128 - allow reboot/poweroff
		256 - allow nicing of all RT tasks
		2 = 0x2 - enable control of console logging level
		4 = 0x4 - enable control of keyboard (SAK, unraw)
		8 = 0x8 - enable debugging dumps of processes etc.
		16 = 0x10 - enable sync command
		32 = 0x20 - enable remount read-only
		64 = 0x40 - enable signalling of processes (term, kill, oom-kill)
		128 = 0x80 - allow reboot/poweroff
		256 = 0x100 - allow nicing of all RT tasks

		You can set the value in the file by the following command:
		echo "number" >/proc/sys/kernel/sysrq

		The number may be written here either as decimal or as hexadecimal
		with the 0x prefix. CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE must always be
		written in hexadecimal.

		Note that the value of /proc/sys/kernel/sysrq influences only the invocation
		via a keyboard. Invocation of any operation via /proc/sysrq-trigger is always
		allowed (by a user with admin privileges).

drivers/tty/bfin_jtag_comm.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -349,7 +349,7 @@ bfin_jc_early_write(struct console co, const char buf, unsigned int count)
		bfin_jc_straight_buffer_write(buf, count);
		}

		static struct __initdata console bfin_jc_early_console = {
		static struct console bfin_jc_early_console __initdata = {
		.name = "early_BFJC",
		.write = bfin_jc_early_write,
		.flags = CON_ANYTIME \| CON_PRINTBUFFER,

drivers/tty/hvc/hvc_dcc.c

+21 −0

Original line number	Diff line number	Diff line
		@@ -86,6 +86,21 @@ static int hvc_dcc_get_chars(uint32_t vt, char *buf, int count)
		return i;
		}

		static bool hvc_dcc_check(void)
		{
		unsigned long time = jiffies + (HZ / 10);

		/* Write a test character to check if it is handled */
		__dcc_putchar('\n');

		while (time_is_after_jiffies(time)) {
		if (!(__dcc_getstatus() & DCC_STATUS_TX))
		return true;
		}

		return false;
		}

		static const struct hv_ops hvc_dcc_get_put_ops = {
		.get_chars = hvc_dcc_get_chars,
		.put_chars = hvc_dcc_put_chars,
		@@ -93,6 +108,9 @@ static const struct hv_ops hvc_dcc_get_put_ops = {

		static int __init hvc_dcc_console_init(void)
		{
		if (!hvc_dcc_check())
		return -ENODEV;

		hvc_instantiate(0, 0, &hvc_dcc_get_put_ops);
		return 0;
		}
		@@ -100,6 +118,9 @@ console_initcall(hvc_dcc_console_init);

		static int __init hvc_dcc_init(void)
		{
		if (!hvc_dcc_check())
		return -ENODEV;

		hvc_alloc(0, 0, &hvc_dcc_get_put_ops, 128);
		return 0;
		}

drivers/tty/hvc/hvc_vio.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -48,6 +48,7 @@
		#include <asm/prom.h>
		#include <asm/hvsi.h>
		#include <asm/udbg.h>
		#include <asm/machdep.h>

		#include "hvc_console.h"

		@@ -457,6 +458,8 @@ void __init hvc_vio_init_early(void)
		if (hvterm_priv0.proto == HV_PROTOCOL_HVSI)
		goto out;
		#endif
		/* Check whether the user has requested a different console. */
		if (!strstr(cmd_line, "console="))
		add_preferred_console("hvc", 0, NULL);
		hvc_instantiate(0, 0, ops);
		out:

Admin message