[1/3] init/Kconfig: Hide printk log config if CONFIG_PRINTK=n

Message ID 1412752265-22198-2-git-send-email-seungho1.park@lge.com
State New
Headers show

Commit Message

seungho1.park@lge.com Oct. 8, 2014, 7:11 a.m.
From: Josh Triplett <josh@joshtriplett.org>

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>
---
 init/Kconfig |    2 ++
 1 file changed, 2 insertions(+)

Comments

Josh Triplett Oct. 8, 2014, 7:23 a.m. | #1
I don't think you meant to feed this patch to git-send-email as-is;
you've just re-sent it to the original authors.  You sent it
to yourself first as a test before sending it to your company's internal
blackduck server, and that version also had the same CCs to myself and
stable@.  Please don't spam the original patch authors when moving
patches around internally.

- Johs Triplett

On Wed, Oct 08, 2014 at 04:11:03PM +0900, seungho1.park@lge.com wrote:
> From: Josh Triplett <josh@joshtriplett.org>
> 
> 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>
> ---
>  init/Kconfig |    2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/init/Kconfig b/init/Kconfig
> index e84c642..31505a5 100644
> --- a/init/Kconfig
> +++ b/init/Kconfig
> @@ -811,6 +811,7 @@ config LOG_BUF_SHIFT
>  	int "Kernel log buffer size (16 => 64KB, 17 => 128KB)"
>  	range 12 21
>  	default 17
> +	depends on PRINTK
>  	help
>  	  Select the minimal kernel log buffer size as a power of 2.
>  	  The final size is affected by LOG_CPU_MAX_BUF_SHIFT config
> @@ -830,6 +831,7 @@ config LOG_CPU_MAX_BUF_SHIFT
>  	range 0 21
>  	default 12 if !BASE_SMALL
>  	default 0 if BASE_SMALL
> +	depends on PRINTK
>  	help
>  	  This option allows to increase the default ring buffer size
>  	  according to the number of CPUs. The value defines the contribution
> -- 
> 1.7.9.5
> 
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/init/Kconfig b/init/Kconfig
index e84c642..31505a5 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -811,6 +811,7 @@  config LOG_BUF_SHIFT
 	int "Kernel log buffer size (16 => 64KB, 17 => 128KB)"
 	range 12 21
 	default 17
+	depends on PRINTK
 	help
 	  Select the minimal kernel log buffer size as a power of 2.
 	  The final size is affected by LOG_CPU_MAX_BUF_SHIFT config
@@ -830,6 +831,7 @@  config LOG_CPU_MAX_BUF_SHIFT
 	range 0 21
 	default 12 if !BASE_SMALL
 	default 0 if BASE_SMALL
+	depends on PRINTK
 	help
 	  This option allows to increase the default ring buffer size
 	  according to the number of CPUs. The value defines the contribution