Commit 91cca0f0 authored Jul 04, 2015 by Linus Torvalds

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

parents ec0337e0 fb39f98d

init/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -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