aboutsummaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorJosh Triplett <josh@joshtriplett.org>2014-10-03 19:00:54 -0400
committerJosh Triplett <josh@joshtriplett.org>2014-10-03 19:49:38 -0400
commit361e9dfbaae84b0b246ed18d1ab7c82a1a41b53e (patch)
treeac3e387a4e94190eded63292fb2be7e24db1527d /init
parent7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9 (diff)
init/Kconfig: Hide printk log config if CONFIG_PRINTK=n
The buffers sized by CONFIG_LOG_BUF_SHIFT and CONFIG_LOG_CPU_MAX_BUF_SHIFT do not exist if CONFIG_PRINTK=n, so don't ask about their size at all. Signed-off-by: Josh Triplett <josh@joshtriplett.org> Acked-by: Randy Dunlap <rdunlap@infradead.org> Cc: stable <stable@vger.kernel.org>
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig
index e84c6423a2e5..31505a52c165 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -811,6 +811,7 @@ config LOG_BUF_SHIFT
811 int "Kernel log buffer size (16 => 64KB, 17 => 128KB)" 811 int "Kernel log buffer size (16 => 64KB, 17 => 128KB)"
812 range 12 21 812 range 12 21
813 default 17 813 default 17
814 depends on PRINTK
814 help 815 help
815 Select the minimal kernel log buffer size as a power of 2. 816 Select the minimal kernel log buffer size as a power of 2.
816 The final size is affected by LOG_CPU_MAX_BUF_SHIFT config 817 The final size is affected by LOG_CPU_MAX_BUF_SHIFT config
@@ -830,6 +831,7 @@ config LOG_CPU_MAX_BUF_SHIFT
830 range 0 21 831 range 0 21
831 default 12 if !BASE_SMALL 832 default 12 if !BASE_SMALL
832 default 0 if BASE_SMALL 833 default 0 if BASE_SMALL
834 depends on PRINTK
833 help 835 help
834 This option allows to increase the default ring buffer size 836 This option allows to increase the default ring buffer size
835 according to the number of CPUs. The value defines the contribution 837 according to the number of CPUs. The value defines the contribution