linux57/58-tkg: Introduce the misc-additions patch and move tty device option from base to it.
That specific patchset breaks packaging on Ubuntu. https://github.com/Frogging-Family/linux-tkg/pull/26 Also temporarily add Alessio Bonfiglio's patch to restore Killer Wireless-AC 1550i support on 5.7. https://bugzilla.kernel.org/show_bug.cgi?id=208141#c21
This commit is contained in:
Tk-Glitch
@@ -118,6 +118,7 @@ source=("https://git.kernel.org/torvalds/t/linux-${_basekernel}-${_sub}.tar.gz"
|
||||
#0009-bmq_v5.8-r0.patch
|
||||
0011-ZFS-fix.patch
|
||||
#0012-linux-hardened.patch
|
||||
0012-misc-additions.patch
|
||||
)
|
||||
sha256sums=('69bd59fc15211f07466d322523a13071eb039ae210b4fb60cf5cf2534783e485'
|
||||
'5ab29eb64e57df83b395a29a6a4f89030d142feffbfbf73b3afc6d97a2a7fd12'
|
||||
@@ -126,14 +127,15 @@ sha256sums=('69bd59fc15211f07466d322523a13071eb039ae210b4fb60cf5cf2534783e485'
|
||||
'66a03c246037451a77b4d448565b1d7e9368270c7d02872fbd0b5d024ed0a997'
|
||||
'f6383abef027fd9a430fd33415355e0df492cdc3c90e9938bf2d98f4f63b32e6'
|
||||
'd02bf5ca08fd610394b9d3a0c3b176d74af206f897dee826e5cbaec97bb4a4aa'
|
||||
'e36b6efad764eeede8cf90b4de6ef5f9241e8cf531530b33ee2e024e2961e9b5'
|
||||
'9619efca028e7f06a33e54cf114832ef1772c443da8cf1b65ae8694df34cf536'
|
||||
'7058e57fd68367b029adc77f2a82928f1433daaf02c8c279cb2d13556c8804d7'
|
||||
'62496f9ca788996181ef145f96ad26291282fcc3fb95cdc04080dcf84365be33'
|
||||
'7fd8e776209dac98627453fda754bdf9aff4a09f27cb0b3766d7983612eb3c74'
|
||||
'de5140936bad5c6c31f7a1b7d20d3937353cf6e26d2d9bcbbe8930db8cbfc397'
|
||||
'19661ec0d39f9663452b34433214c755179894528bf73a42f6ba52ccf572832a'
|
||||
'cd225e86d72eaf6c31ef3d7b20df397f4cc44ddd04389850691292cdf292b204'
|
||||
'49262ce4a8089fa70275aad742fc914baa28d9c384f710c9a62f64796d13e104')
|
||||
'49262ce4a8089fa70275aad742fc914baa28d9c384f710c9a62f64796d13e104'
|
||||
'bdc60c83cd5fbf9912f9201d6e4fe3c84fe5f634e6823bd8e78264ad606b3a9e')
|
||||
|
||||
export KBUILD_BUILD_HOST=archlinux
|
||||
export KBUILD_BUILD_USER=$pkgbase
|
||||
|
||||
@@ -77,6 +77,9 @@ _ftracedisable="false"
|
||||
# Set to "true" to disable NUMA, lowering overhead, but breaking CUDA/NvEnc on Nvidia equipped systems - Kernel default is "false"
|
||||
_numadisable="false"
|
||||
|
||||
# Set to "true" to enable misc additions - May contain temporary fixes pending upstream or changes that can break on non-Arch - Kernel default is "true"
|
||||
_misc_adds="true"
|
||||
|
||||
# Set to "1" to use CattaRappa mode (enabling full tickless), "2" for tickless idle only, or "0" for periodic ticks.
|
||||
# Full tickless can give higher performances in various cases but, depending on hardware, lower consistency. Just tickless idle can perform better on some platforms (mostly AMD based).
|
||||
_tickless=""
|
||||
|
||||
@@ -28,6 +28,11 @@ _tkg_srcprep() {
|
||||
msg2 "Applying glitched base patch"
|
||||
patch -Np1 -i ../0003-glitched-base.patch
|
||||
|
||||
if [ "$_misc_adds" = "true" ]; then
|
||||
msg2 "Applying misc additions patch"
|
||||
patch -Np1 -i ../0012-misc-additions.patch
|
||||
fi
|
||||
|
||||
if [ "${_cpusched}" == "MuQSS" ]; then
|
||||
# MuQSS
|
||||
patch -Np1 -i ../0004-5.8-ck1.patch
|
||||
|
||||
@@ -100,30 +100,6 @@ index 4f32c4062fb6..c0bf039e1b40 100644
|
||||
} sgid_addr, dgid_addr;
|
||||
int ret;
|
||||
|
||||
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/include/linux/blkdev.h b/include/linux/blkdev.h
|
||||
index 79226ca8f80f..2a30060e7e1d 100644
|
||||
--- a/include/linux/blkdev.h
|
||||
@@ -140,37 +116,6 @@ index 79226ca8f80f..2a30060e7e1d 100644
|
||||
|
||||
/* Must be consistent with blk_mq_poll_stats_bkt() */
|
||||
#define BLK_MQ_POLL_STATS_BKTS 16
|
||||
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
|
||||
|
||||
55
linux58-rc-tkg/linux58-tkg-patches/0012-misc-additions.patch
Normal file
55
linux58-rc-tkg/linux58-tkg-patches/0012-misc-additions.patch
Normal file
@@ -0,0 +1,55 @@
|
||||
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/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) */
|
||||
|
||||
Reference in New Issue
Block a user