summaryrefslogtreecommitdiffstats
path: root/arch/x86/Makefile
diff options
context:
space:
mode:
authorAntonio Borneo <borneo.antonio@gmail.com>2014-04-13 16:26:08 +0800
committerIngo Molnar <mingo@kernel.org>2014-04-14 08:50:36 +0200
commitf96364041ccda63ff4bed96fd06b267d8d841dc0 (patch)
tree283099105e97951e3fdce5bd3bed36fdad89fbb0 /arch/x86/Makefile
parentab0a9358ecf87bb801ce124473e7db713457bec4 (diff)
downloadlinux-f96364041ccda63ff4bed96fd06b267d8d841dc0.tar.bz2
x86/platform: Fix "make O=dir kvmconfig"
Running: make O=dir x86_64_defconfig make O=dir kvmconfig the second command dirties the source tree with file ".config", symlink "source" and objects in folder "scripts". Fixed by using properly prefixed paths in the arch Makefile. Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com> Acked-by: Borislav Petkov <bp@suse.de> Cc: Pekka Enberg <penberg@kernel.org> Link: http://lkml.kernel.org/r/1397377568-8375-1-git-send-email-borneo.antonio@gmail.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/Makefile')
-rw-r--r--arch/x86/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 3b9348a0c1a4..0db89106854e 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -250,8 +250,8 @@ archclean:
PHONY += kvmconfig
kvmconfig:
$(if $(wildcard $(objtree)/.config),, $(error You need an existing .config for this target))
- $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m -O $(objtree) $(objtree)/.config arch/x86/configs/kvm_guest.config
- $(Q)yes "" | $(MAKE) oldconfig
+ $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m -O $(objtree) $(objtree)/.config $(srctree)/arch/x86/configs/kvm_guest.config
+ $(Q)yes "" | $(MAKE) -f $(srctree)/Makefile oldconfig
define archhelp
echo '* bzImage - Compressed kernel image (arch/x86/boot/bzImage)'