Merge commit 'linus/master' into tracing/kprobes

[~andy/linux] / arch / x86 / Makefile

diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 7983c420eaf2a304843b9b0563b4811626720c71..4aefc034e9a0a869593a88b7aaf2423f6aaf618b 100644 (file)
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -156,6 +156,9 @@ all: bzImage
 KBUILD_IMAGE := $(boot)/bzImage
 
 bzImage: vmlinux
+ifeq ($(CONFIG_X86_DECODER_SELFTEST),y)
+       $(Q)$(MAKE) $(build)=arch/x86/tools posttest
+endif
        $(Q)$(MAKE) $(build)=$(boot) $(KBUILD_IMAGE)
        $(Q)mkdir -p $(objtree)/arch/$(UTS_MACHINE)/boot
        $(Q)ln -fsn ../../x86/boot/bzImage $(objtree)/arch/$(UTS_MACHINE)/boot/$@