aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVivek Goyal <vgoyal@redhat.com>2014-08-08 17:25:41 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-08-08 18:57:32 -0400
commitde5b56ba51f63973ceb5c184ee0855f0c8a13fc9 (patch)
treecaae1a83d7affec1752f0a5e443c87c38e0bafe3
parent8370edea81e321b8a976969753d6b2811e6d5ed6 (diff)
kernel: build bin2c based on config option CONFIG_BUILD_BIN2C
currently bin2c builds only if CONFIG_IKCONFIG=y. But bin2c will now be used by kexec too. So make it compilation dependent on CONFIG_BUILD_BIN2C and this config option can be selected by CONFIG_KEXEC and CONFIG_IKCONFIG. Signed-off-by: Vivek Goyal <vgoyal@redhat.com> Cc: Borislav Petkov <bp@suse.de> Cc: Michael Kerrisk <mtk.manpages@gmail.com> Cc: Yinghai Lu <yinghai@kernel.org> Cc: Eric Biederman <ebiederm@xmission.com> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Matthew Garrett <mjg59@srcf.ucam.org> Cc: Greg Kroah-Hartman <greg@kroah.com> Cc: Dave Young <dyoung@redhat.com> Cc: WANG Chao <chaowang@redhat.com> Cc: Baoquan He <bhe@redhat.com> Cc: Andy Lutomirski <luto@amacapital.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/x86/Kconfig1
-rw-r--r--init/Kconfig5
-rw-r--r--scripts/basic/Makefile2
3 files changed, 7 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index c915cc6e40be..98fe3df6df82 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1582,6 +1582,7 @@ source kernel/Kconfig.hz
1582 1582
1583config KEXEC 1583config KEXEC
1584 bool "kexec system call" 1584 bool "kexec system call"
1585 select BUILD_BIN2C
1585 ---help--- 1586 ---help---
1586 kexec is a system call that implements the ability to shutdown your 1587 kexec is a system call that implements the ability to shutdown your
1587 current kernel, and to start another kernel. It is like a reboot 1588 current kernel, and to start another kernel. It is like a reboot
diff --git a/init/Kconfig b/init/Kconfig
index a291b7ef4738..44f9ed3dae22 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -783,8 +783,13 @@ endchoice
783 783
784endmenu # "RCU Subsystem" 784endmenu # "RCU Subsystem"
785 785
786config BUILD_BIN2C
787 bool
788 default n
789
786config IKCONFIG 790config IKCONFIG
787 tristate "Kernel .config support" 791 tristate "Kernel .config support"
792 select BUILD_BIN2C
788 ---help--- 793 ---help---
789 This option enables the complete Linux kernel ".config" file 794 This option enables the complete Linux kernel ".config" file
790 contents to be saved in the kernel. It provides documentation 795 contents to be saved in the kernel. It provides documentation
diff --git a/scripts/basic/Makefile b/scripts/basic/Makefile
index afbc1cd69ac5..ec10d9345bc2 100644
--- a/scripts/basic/Makefile
+++ b/scripts/basic/Makefile
@@ -9,7 +9,7 @@
9# fixdep: Used to generate dependency information during build process 9# fixdep: Used to generate dependency information during build process
10 10
11hostprogs-y := fixdep 11hostprogs-y := fixdep
12hostprogs-$(CONFIG_IKCONFIG) += bin2c 12hostprogs-$(CONFIG_BUILD_BIN2C) += bin2c
13always := $(hostprogs-y) 13always := $(hostprogs-y)
14 14
15# fixdep is needed to compile other host programs 15# fixdep is needed to compile other host programs