[3.13.y.z extended stable] Patch "init/Kconfig: Hide printk log config if CONFIG_PRINTK=n" has been added to staging queue

Kamal Mostafa kamal at canonical.com
Thu Oct 9 20:51:51 UTC 2014


This is a note to let you know that I have just added a patch titled

    init/Kconfig: Hide printk log config if CONFIG_PRINTK=n

to the linux-3.13.y-queue branch of the 3.13.y.z extended stable tree 
which can be found at:

 http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.13.y-queue

This patch is scheduled to be released in version 3.13.11.9.

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.13.y.z tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Kamal

------

>From 6df7f63fe79921ef35a25dd0ddad2b267eaaf38e Mon Sep 17 00:00:00 2001
From: Josh Triplett <josh at joshtriplett.org>
Date: Fri, 3 Oct 2014 16:00:54 -0700
Subject: 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 at joshtriplett.org>
Acked-by: Randy Dunlap <rdunlap at infradead.org>
[ kamal: backport to 3.13-stable: only LOG_BUF_SHIFT ]
Signed-off-by: Kamal Mostafa <kamal at canonical.com>
---
 init/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/init/Kconfig b/init/Kconfig
index c3a1d7c..bb3a9f1 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -783,6 +783,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:
--
1.9.1





More information about the kernel-team mailing list