[SPARC64]: Recognize "virtual-console" as input and output console device. (1a7a242c) · Commits · 戴 / test

arch/sparc64/kernel/setup.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -405,6 +405,11 @@ static int __init set_preferred_console(void)
		serial_console = 2;
		} else if (idev == PROMDEV_IRSC && odev == PROMDEV_ORSC) {
		serial_console = 3;
		} else if (idev == PROMDEV_IVCONS && odev == PROMDEV_OVCONS) {
		/* sunhv_console_init() doesn't check the serial_console
		* value anyways...
		*/
		serial_console = 4;
		} else {
		prom_printf("Inconsistent console: "
		"input %d, output %d\n",

+6 −0

Original line number	Diff line number	Diff line
		@@ -102,6 +102,9 @@ prom_query_input_device(void)
		if (!strncmp (propb, "rsc", 3))
		return PROMDEV_IRSC;

		if (!strncmp (propb, "virtual-console", 3))
		return PROMDEV_IVCONS;

		if (strncmp (propb, "tty", 3) \|\| !propb[3])
		return PROMDEV_I_UNK;

		@@ -143,6 +146,9 @@ prom_query_output_device(void)
		if (!strncmp (propb, "rsc", 3))
		return PROMDEV_ORSC;

		if (!strncmp (propb, "virtual-console", 3))
		return PROMDEV_OVCONS;

		if (strncmp (propb, "tty", 3) \|\| !propb[3])
		return PROMDEV_O_UNK;

+2 −0

Original line number	Diff line number	Diff line
		@@ -165,6 +165,7 @@ enum prom_input_device {
		PROMDEV_ITTYA, /* input from ttya */
		PROMDEV_ITTYB, /* input from ttyb */
		PROMDEV_IRSC, /* input from rsc */
		PROMDEV_IVCONS, /* input from virtual-console */
		PROMDEV_I_UNK,
		};

		@@ -177,6 +178,7 @@ enum prom_output_device {
		PROMDEV_OTTYA, /* to ttya */
		PROMDEV_OTTYB, /* to ttyb */
		PROMDEV_ORSC, /* to rsc */
		PROMDEV_OVCONS, /* to virtual-console */
		PROMDEV_O_UNK,
		};

+2 −0

Original line number	Diff line number	Diff line
		@@ -167,6 +167,7 @@ enum prom_input_device {
		PROMDEV_ITTYA, /* input from ttya */
		PROMDEV_ITTYB, /* input from ttyb */
		PROMDEV_IRSC, /* input from rsc */
		PROMDEV_IVCONS, /* input from virtual-console */
		PROMDEV_I_UNK,
		};

		@@ -179,6 +180,7 @@ enum prom_output_device {
		PROMDEV_OTTYA, /* to ttya */
		PROMDEV_OTTYB, /* to ttyb */
		PROMDEV_ORSC, /* to rsc */
		PROMDEV_OVCONS, /* to virtual-console */
		PROMDEV_O_UNK,
		};