diff --git a/PKGBUILD b/PKGBUILD index 29feb36..9cf29e0 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -99,7 +99,7 @@ case $_basever in '66a03c246037451a77b4d448565b1d7e9368270c7d02872fbd0b5d024ed0a997' '31dc68e84aecfb7d069efb1305049122c65694676be8b955634abcf0675922a2' 'd02bf5ca08fd610394b9d3a0c3b176d74af206f897dee826e5cbaec97bb4a4aa' - '156a2c75fd228920e3c3da5e04a110afa403951bdfbb85772c2fd4b82fd24d61' + '3ef74dd80dc8c4323803cbf868178cf01d8ed69f09fe2f537ff91124cbd6e611' '7058e57fd68367b029adc77f2a82928f1433daaf02c8c279cb2d13556c8804d7' 'c605f638d74c61861ebdc36ebd4cb8b6475eae2f6273e1ccb2bbb3e10a2ec3fe' 'bc69d6e5ee8172b0242c8fa72d13cfe2b8d2b6601468836908a7dfe8b78a3bbb' diff --git a/linux-tkg-patches/5.4/0003-glitched-base.patch b/linux-tkg-patches/5.4/0003-glitched-base.patch index 4cbf12d..83a364a 100644 --- a/linux-tkg-patches/5.4/0003-glitched-base.patch +++ b/linux-tkg-patches/5.4/0003-glitched-base.patch @@ -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