]> git.hungrycats.org Git - linux/commitdiff
zygo: disable ftrace startup test, as it tends to fail by hanging
authorZygo Blaxell <zblaxell@river.furryterror.org>
Fri, 8 Oct 2010 15:20:03 +0000 (11:20 -0400)
committerZygo Blaxell <zblaxell@river.furryterror.org>
Fri, 8 Oct 2010 15:20:03 +0000 (11:20 -0400)
.config

diff --git a/.config b/.config
index 2e995bcadcf3f55db9d185dd32ffc88baac9bdf4..ca0d9ad5fc96ad57f2333c2e8d5d0b8e9f19f186 100644 (file)
--- a/.config
+++ b/.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.35.3-zb64
+# Linux kernel version: 2.6.35.7-zb64
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -59,6 +59,7 @@ CONFIG_X86_HT=y
 CONFIG_X86_TRAMPOLINE=y
 CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11"
 # CONFIG_KTIME_SCALAR is not set
+CONFIG_ARCH_CPU_PROBE_RELEASE=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 CONFIG_CONSTRUCTORS=y
 
@@ -5118,9 +5119,7 @@ CONFIG_KPROBE_EVENT=y
 CONFIG_DYNAMIC_FTRACE=y
 CONFIG_FUNCTION_PROFILER=y
 CONFIG_FTRACE_MCOUNT_RECORD=y
-CONFIG_FTRACE_SELFTEST=y
-CONFIG_FTRACE_STARTUP_TEST=y
-CONFIG_EVENT_TRACE_TEST_SYSCALLS=y
+# CONFIG_FTRACE_STARTUP_TEST is not set
 CONFIG_MMIOTRACE=y
 CONFIG_MMIOTRACE_TEST=m
 CONFIG_RING_BUFFER_BENCHMARK=m