Merge branch 'akpm-current/current'

[karo-tx-linux.git] / arch / x86 / kernel / Makefile

diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index d5fb0871aba3fcb3a556dae66255c8b185b7e32e..edfa3ec6fc8e626baab96265aa2cb4f1c8c7a857 100644 (file)
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -24,6 +24,11 @@ OBJECT_FILES_NON_STANDARD_head_$(BITS).o             := y
 OBJECT_FILES_NON_STANDARD_relocate_kernel_$(BITS).o    := y
 OBJECT_FILES_NON_STANDARD_mcount_$(BITS).o             := y
 OBJECT_FILES_NON_STANDARD_test_nx.o                    := y
+# If instrumentation of this dir is enabled, boot hangs during first second.
+# Probably could be more selective here, but note that files related to irqs,
+# boot, dumpstack/stacktrace, etc are either non-interesting or can lead to
+# non-deterministic coverage.
+KCOV_INSTRUMENT := n
 
 CFLAGS_irq.o := -I$(src)/../include/asm/trace