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

diff --git a/.config b/.config
index e2fef325916d317cfef201e7ebdbb37d725ec27a..3d635bfac727705b70b227c85fc7d4380913fb31 100644 (file)
--- a/.config
+++ b/.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.27.39-zb64
+# Linux kernel version: 2.6.27.54-zb64
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -3856,8 +3856,7 @@ CONFIG_PREEMPT_TRACER=y
 CONFIG_SYSPROF_TRACER=y
 CONFIG_SCHED_TRACER=y
 CONFIG_CONTEXT_SWITCH_TRACER=y
-CONFIG_FTRACE_SELFTEST=y
-CONFIG_FTRACE_STARTUP_TEST=y
+# CONFIG_FTRACE_STARTUP_TEST is not set
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
 # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
 CONFIG_BUILD_DOCSRC=y