diff options
| author | mokopatches <mokopatches@openmoko.org> | 2008-11-19 17:03:17 +0000 |
|---|---|---|
| committer | warmcat <andy@warmcat.com> | 2008-11-19 17:03:17 +0000 |
| commit | 3c948e4702df9fd846633f71adb8a7912811834c (patch) | |
| tree | 39df530bd602aa48125b5828926d2a625c979394 | |
| parent | 33e6d7ec683f0d56868fc01cf052d5765081fd6d (diff) | |
config-nr-tty-devices.patch
| -rw-r--r-- | drivers/char/Kconfig | 12 | ||||
| -rw-r--r-- | include/linux/vt.h | 11 |
2 files changed, 23 insertions, 0 deletions
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index 43b35d0369d..1bc4eaf1f7f 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig @@ -66,6 +66,18 @@ config VT_CONSOLE If unsure, say Y. +config NR_TTY_DEVICES + int "Maximum tty device number" + depends on VT + default 63 + ---help--- + This is the highest numbered device created in /dev. You will actually have + NR_TTY_DEVICES+1 devices in /dev. The default is 63, which will result in + 64 /dev entries. The lowest number you can set is 11, anything below that, + and it will default to 11. 63 is also the upper limit so we don't overrun + the serial consoles. + + config HW_CONSOLE bool depends on VT && !S390 && !UML diff --git a/include/linux/vt.h b/include/linux/vt.h index 02c1c028877..2ba4d211e30 100644 --- a/include/linux/vt.h +++ b/include/linux/vt.h @@ -18,8 +18,19 @@ extern int unregister_vt_notifier(struct notifier_block *nb); * resizing). */ #define MIN_NR_CONSOLES 1 /* must be at least 1 */ +#if (CONFIG_NR_TTY_DEVICES < 4) +/* Lower Limit */ +#define MAX_NR_CONSOLES 4 /* serial lines start at 64 */ +#define MAX_NR_USER_CONSOLES 4 /* must be root to allocate above this */ +#elif (CONFIG_NR_TTY_DEVICES > 63) +/* Upper Limit */ #define MAX_NR_CONSOLES 63 /* serial lines start at 64 */ #define MAX_NR_USER_CONSOLES 63 /* must be root to allocate above this */ +#else +/* They chose a sensible number */ +#define MAX_NR_CONSOLES CONFIG_NR_TTY_DEVICES +#define MAX_NR_USER_CONSOLES CONFIG_NR_TTY_DEVICES +#endif /* Note: the ioctl VT_GETSTATE does not work for consoles 16 and higher (since it returns a short) */ |