|
|
|
|
@ -3943,30 +3943,6 @@ index 000000000000..209cb6487e24
|
|
|
|
|
+
|
|
|
|
|
+module_init(tp_init);
|
|
|
|
|
+module_exit(tp_exit);
|
|
|
|
|
diff --git a/drivers/tty/Kconfig b/drivers/tty/Kconfig
|
|
|
|
|
index 0840d27381ea..73aba9a31064 100644
|
|
|
|
|
--- a/drivers/tty/Kconfig
|
|
|
|
|
+++ b/drivers/tty/Kconfig
|
|
|
|
|
@@ -75,6 +75,19 @@ config VT_CONSOLE_SLEEP
|
|
|
|
|
def_bool y
|
|
|
|
|
depends on VT_CONSOLE && PM_SLEEP
|
|
|
|
|
|
|
|
|
|
+config NR_TTY_DEVICES
|
|
|
|
|
+ int "Maximum tty device number"
|
|
|
|
|
+ depends on VT
|
|
|
|
|
+ range 12 63
|
|
|
|
|
+ default 63
|
|
|
|
|
+ ---help---
|
|
|
|
|
+ This option is used to change the number of tty devices in /dev.
|
|
|
|
|
+ The default value is 63. The lowest number you can set is 12,
|
|
|
|
|
+ 63 is also the upper limit so we don't overrun the serial
|
|
|
|
|
+ consoles.
|
|
|
|
|
+
|
|
|
|
|
+ If unsure, say 63.
|
|
|
|
|
+
|
|
|
|
|
config HW_CONSOLE
|
|
|
|
|
bool
|
|
|
|
|
depends on VT && !UML
|
|
|
|
|
diff --git a/fs/exec.c b/fs/exec.c
|
|
|
|
|
index 65eaacaba4f4..1d3b310bd5f0 100644
|
|
|
|
|
--- a/fs/exec.c
|
|
|
|
|
@ -4144,37 +4120,6 @@ index 000000000000..1b80d7ee5493
|
|
|
|
|
+
|
|
|
|
|
+#endif /* __KERNEL */
|
|
|
|
|
+#endif /* _THINKPAD_EC_H */
|
|
|
|
|
diff --git a/include/uapi/linux/vt.h b/include/uapi/linux/vt.h
|
|
|
|
|
index e9d39c48520a..3bceead8da40 100644
|
|
|
|
|
--- a/include/uapi/linux/vt.h
|
|
|
|
|
+++ b/include/uapi/linux/vt.h
|
|
|
|
|
@@ -3,12 +3,25 @@
|
|
|
|
|
#define _UAPI_LINUX_VT_H
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
+/*
|
|
|
|
|
+ * We will make this definition solely for the purpose of making packages
|
|
|
|
|
+ * such as splashutils build, because they can not understand that
|
|
|
|
|
+ * NR_TTY_DEVICES is defined in the kernel configuration.
|
|
|
|
|
+ */
|
|
|
|
|
+#ifndef CONFIG_NR_TTY_DEVICES
|
|
|
|
|
+#define CONFIG_NR_TTY_DEVICES 63
|
|
|
|
|
+#endif
|
|
|
|
|
+
|
|
|
|
|
/*
|
|
|
|
|
* These constants are also useful for user-level apps (e.g., VC
|
|
|
|
|
* resizing).
|
|
|
|
|
*/
|
|
|
|
|
#define MIN_NR_CONSOLES 1 /* must be at least 1 */
|
|
|
|
|
-#define MAX_NR_CONSOLES 63 /* serial lines start at 64 */
|
|
|
|
|
+/*
|
|
|
|
|
+ * NR_TTY_DEVICES:
|
|
|
|
|
+ * Value MUST be at least 12 and must never be higher then 63
|
|
|
|
|
+ */
|
|
|
|
|
+#define MAX_NR_CONSOLES CONFIG_NR_TTY_DEVICES /* serial lines start above this */
|
|
|
|
|
/* Note: the ioctl VT_GETSTATE does not work for
|
|
|
|
|
consoles 16 and higher (since it returns a short) */
|
|
|
|
|
|
|
|
|
|
diff --git a/init/Kconfig b/init/Kconfig
|
|
|
|
|
index 041f3a022122..5ed70eb1ad3a 100644
|
|
|
|
|
--- a/init/Kconfig
|
|
|
|
|
|
Tk-Glitch