Merge commit 'b13b1d2d8692' into x86/mm

It got into x86/urgent but isn't really urgent material.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --combined arch/x86/Makefile
index 602f57e590b57fafd8dcf461c9a5468842d9c29e,0db89106854e76e2604146dc32ac44ff17792f2e..d1b7c377a234e900b0af97d7a784e5cfeedd64f0
--- 1/arch/x86/Makefile
--- 2/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@@ -108,7 -108,7 +108,7 @@@ els
  
          # this works around some issues with generating unwind tables in older gccs
          # newer gccs do it by default
 -        KBUILD_CFLAGS += -maccumulate-outgoing-args
 +        KBUILD_CFLAGS += $(call cc-option,-maccumulate-outgoing-args)
  endif
  
  # Make sure compiler does not have buggy stack-protector support.
@@@ -250,8 -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)'