Commit dc8c85871c9728c5fddca6854a191fd41eb9438c
Committed by
Greg Kroah-Hartman
1 parent
45aaae9c51
Exists in
master
and in
4 other branches
PTY: add kernel parameter to overwrite legacy pty count
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Showing 3 changed files with 11 additions and 3 deletions Side-by-side Diff
Documentation/kernel-parameters.txt
... | ... | @@ -1430,6 +1430,10 @@ |
1430 | 1430 | pt. [PARIDE] |
1431 | 1431 | See Documentation/paride.txt. |
1432 | 1432 | |
1433 | + pty.legacy_count= | |
1434 | + [KNL] Number of legacy pty's. Overwrites compiled-in | |
1435 | + default number. | |
1436 | + | |
1433 | 1437 | quiet [KNL] Disable most log messages |
1434 | 1438 | |
1435 | 1439 | r128= [HW,DRM] |
drivers/char/pty.c
... | ... | @@ -248,14 +248,19 @@ |
248 | 248 | return -ENOIOCTLCMD; |
249 | 249 | } |
250 | 250 | |
251 | +static int legacy_count = CONFIG_LEGACY_PTY_COUNT; | |
252 | +module_param(legacy_count, int, 0); | |
253 | + | |
251 | 254 | static void __init legacy_pty_init(void) |
252 | 255 | { |
256 | + if (legacy_count <= 0) | |
257 | + return; | |
253 | 258 | |
254 | - pty_driver = alloc_tty_driver(NR_PTYS); | |
259 | + pty_driver = alloc_tty_driver(legacy_count); | |
255 | 260 | if (!pty_driver) |
256 | 261 | panic("Couldn't allocate pty driver"); |
257 | 262 | |
258 | - pty_slave_driver = alloc_tty_driver(NR_PTYS); | |
263 | + pty_slave_driver = alloc_tty_driver(legacy_count); | |
259 | 264 | if (!pty_slave_driver) |
260 | 265 | panic("Couldn't allocate pty slave driver"); |
261 | 266 |
include/linux/tty.h
... | ... | @@ -21,7 +21,6 @@ |
21 | 21 | * (Note: the *_driver.minor_start values 1, 64, 128, 192 are |
22 | 22 | * hardcoded at present.) |
23 | 23 | */ |
24 | -#define NR_PTYS CONFIG_LEGACY_PTY_COUNT /* Number of legacy ptys */ | |
25 | 24 | #define NR_UNIX98_PTY_DEFAULT 4096 /* Default maximum for Unix98 ptys */ |
26 | 25 | #define NR_UNIX98_PTY_MAX (1 << MINORBITS) /* Absolute limit */ |
27 | 26 | #define NR_LDISCS 17 |