aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBorislav Petkov <bp@suse.de>2013-06-21 04:04:51 -0400
committerIngo Molnar <mingo@kernel.org>2013-06-23 06:17:35 -0400
commitfc58be7596b832ee9635b2f7090a589ac5cdb807 (patch)
tree507fcd909ad5fbbe74877c264885715a64327649
parent46ff53874bd935ab9955dee56d60212857e89bf3 (diff)
x86/platform: Add kvmconfig to the phony targets
... so as not to disable it with a file of the same name in the toplevel build directory. Signed-off-by: Borislav Petkov <bp@suse.de> Link: http://lkml.kernel.org/r/1371801891-23618-1-git-send-email-bp@alien8.de Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r--arch/x86/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 91ee171f1cff..07639c656fcd 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -220,6 +220,7 @@ archclean:
220 $(Q)$(MAKE) $(clean)=$(boot) 220 $(Q)$(MAKE) $(clean)=$(boot)
221 $(Q)$(MAKE) $(clean)=arch/x86/tools 221 $(Q)$(MAKE) $(clean)=arch/x86/tools
222 222
223PHONY += kvmconfig
223kvmconfig: 224kvmconfig:
224 $(if $(wildcard $(objtree)/.config),, $(error You need an existing .config for this target)) 225 $(if $(wildcard $(objtree)/.config),, $(error You need an existing .config for this target))
225 $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m -O $(objtree) $(objtree)/.config arch/x86/configs/kvm_guest.config 226 $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m -O $(objtree) $(objtree)/.config arch/x86/configs/kvm_guest.config