linux-tkg/linux-tkg/linux-tkg-patches/5.8/0012-misc-additions.patch
Tony ea29e81042
Merge linux-tkg packages into a single package, add Void Linux and Clang/LLVM support (#63)
* Add Clang/LLVM and Void Linux support

* merge packages, update .gitignore

* Stage 2 of merge

* Stage 3 of merge

* Stage 4 of merge

* Stage 5 of mrege, almost done

* Complete merge of linux-tkg, sync with master (undead PDS 5.8)

* Complete merge of linux-tkg, sync with master (undead PDS 5.8)

* Forgot to add all the patches

* Fix prompt, add config_hardened files

* Fix some stuff for Void

* Merge linux-tkg README, add Void Linux info

* typo

* Fix broken MuQSS on Void at least, Fix CPU opts patch apply

* update to 5.8.8, 5.4.64, block LLVM build with kernel 5.7 because it
seems to segfault at linking vmlinux, fix RC building on Void Linux

* update to 5.8.8, 5.4.64. seems making a confdir variable wasn't
necessary, revert it. sync with master.

* remove variables for messages in favor of defined functions in the Void
template

* resync Linux58-tkg back to master

* Clear patches is the same file for every version

* glitched base is the same file for 5.8 and 5.9, fix wrong version in kernel selection for 5.8, also just use * since it's the same .-.

* merge some patches that are the same together, fix building 5.4 BMQ

* BMQ and PDS ondemand are the same file, fix missing space on kernel version selection

* add Clang makedepends to PKGBUILD, add missing compiler option in customization.cfg, make GCC recommended

* Add kernel selection to install.sh

* Somehow this wasn't edited

* Add optional clang deps to install.sh

* Update gitignore to just ignore linux-5.x instead of commenting it out

* Missing fi

* forgot to sync back install.sh...

* generalize desktop profile configs, uncomment fsync and bcachefs in
customization.cfg, add Project C /PDS and Undead PDS to README, credit
plug, add kernel version selection to customization.cfg, fallback for
compiler selection

* Fix compiler selection error out on Void (for some reason xbps-src always
runs the else statement) also avoid conflict with _compiler, rename it
to _compiler_opt for the actual options in the make command

* oops

* Fix Void extra config not appearing, missing indent for _configfile,
missed PKGBUILD in other commit...

* remove globbing in install.sh

* Move loading of external configuration to the beginning of _tkg_initscript

* Change MuQSS note in README

* 5.4.68, 5.8.12, 5.9-rc7

* Update Project C patchset to v5.8-r3

* 5.8 bcachefs

* LLVM=1 was required to be used on make commands otherwise it would reset
config, we don't need to know if gcc was used to build a kernel (since
llvm is appended to llvm builds), remove the compiler_name if not using
llvm, make kernel versions variables in prepare

* _compileropt does not need to be llvm specific

* add fix for AMD GPU DCN3.0 build with clang in glitched base 5.9
https://lore.kernel.org/amd-gfx/4b5927dd-9f2d-40f9-ef63-007cf7b65f37@amd.com/T/#t

* Revert "add fix for AMD GPU DCN3.0 build with clang in glitched base 5.9"

This reverts commit 276e219f9fe89397332c91e601f34a37b3a0503f.

merged upstream

* Sync with linux-tkg master

* Just stick every patch into it's own kernel version folder

* update 5.4.72, 5.8.16

* check for sum check fail on Void, fix fsync patch

* Update README.md

* README.md formatting

* forgot to move that

* linux59-tkg: Import 5.9 version of the bcachefs patchset - https://gthub.com/koverstreet/bcachefs

Co-authored-by: Lukáš Horáček <flgx@protonmail.com>
2020-10-26 00:43:11 +01:00

54 lines
1.7 KiB
Diff

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) */