diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-04 08:16:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-04 08:16:41 -0700 |
| commit | 91cca0f0ffa3e485ad9d5b44744f23318c8f99ab (patch) | |
| tree | ce68f1f8dc0ccf73f82bb8111414ee08f86af852 /init | |
| parent | ec0337e089b21d1d81e23d31807a9b02df11daac (diff) | |
| parent | fb39f98d14d2c92531e79bcda5a0b802e2aaf202 (diff) | |
| download | linux-91cca0f0ffa3e485ad9d5b44744f23318c8f99ab.tar.gz linux-91cca0f0ffa3e485ad9d5b44744f23318c8f99ab.tar.bz2 linux-91cca0f0ffa3e485ad9d5b44744f23318c8f99ab.zip | |
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull max log buf size increase from Ingo Molnar:
"Ran into this limit recently, so increase it by an order of magnitude"
* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
printk: Increase maximum CONFIG_LOG_BUF_SHIFT from 21 to 25
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/init/Kconfig b/init/Kconfig index bcc41bd19999..53c41a84dd03 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -820,7 +820,7 @@ config IKCONFIG_PROC config LOG_BUF_SHIFT int "Kernel log buffer size (16 => 64KB, 17 => 128KB)" - range 12 21 + range 12 25 default 17 depends on PRINTK help |