aboutsummaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorJosh Triplett <josh@joshtriplett.org>2014-10-03 16:00:54 -0700
committerBen Hutchings <ben@decadent.org.uk>2014-11-05 20:27:46 +0000
commitff872daa0999be34260b8462802a73d855c4a814 (patch)
tree6cfbe3083c72bd2070f2c01534a71e3de6cfd253 /init
parent96cb09b889f547e49e443966aff537adf6630707 (diff)
downloadkernel_samsung_smdk4412-ff872daa0999be34260b8462802a73d855c4a814.zip
kernel_samsung_smdk4412-ff872daa0999be34260b8462802a73d855c4a814.tar.gz
kernel_samsung_smdk4412-ff872daa0999be34260b8462802a73d855c4a814.tar.bz2
init/Kconfig: Hide printk log config if CONFIG_PRINTK=n
commit 361e9dfbaae84b0b246ed18d1ab7c82a1a41b53e upstream. 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> [bwh: Backported to 3.2: drop change to CONFIG_LOG_CPU_MAX_BUF_SHIFT] Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 43298f9..b8dc1de 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -555,6 +555,7 @@ config LOG_BUF_SHIFT
int "Kernel log buffer size (16 => 64KB, 17 => 128KB)"
range 12 21
default 17
+ depends on PRINTK
help
Select kernel log buffer size as a power of 2.
Examples: