---

yaml --- r: 140675 b: refs/heads/master c: ecf441b h: refs/heads/master i: 140673: 2cbe8d6 140671: 096694d v: v3
git-mirror · Jan 30, 2009 · 7801814 · 7801814
1 parent e4e4efd
commit 7801814
Show file tree

Hide file tree

Showing 15 changed files with 35 additions and 700 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b3a8c34886d0e3dd3a24a5b614ee025181da2f41
+refs/heads/master: ecf441b593ac41cb8cd8cd3695110167c42e098c
diff --git a/trunk/arch/x86/kernel/ftrace.c b/trunk/arch/x86/kernel/ftrace.c
@@ -133,14 +133,15 @@ void ftrace_nmi_exit(void)
 
 static void wait_for_nmi(void)
 {
-	if (!atomic_read(&in_nmi))
-		return;
+	int waited = 0;
 
-	do {
+	while (atomic_read(&in_nmi)) {
+		waited = 1;
 		cpu_relax();
-	} while(atomic_read(&in_nmi));
+	}
 
-	nmi_wait_count++;
+	if (waited)
+		nmi_wait_count++;
 }
 
 static int

diff --git a/trunk/block/Kconfig b/trunk/block/Kconfig
@@ -50,8 +50,6 @@ config BLK_DEV_IO_TRACE
 	select RELAY
 	select DEBUG_FS
 	select TRACEPOINTS
-	select TRACING
-	select STACKTRACE
 	help
 	  Say Y here if you want to be able to trace the block layer actions
 	  on a given queue. Tracing allows you to see any traffic happening
@@ -60,12 +58,6 @@ config BLK_DEV_IO_TRACE
 
 	  git://git.kernel.dk/blktrace.git
 
-	  Tracing also is possible using the ftrace interface, e.g.:
-
-	    echo 1 > /sys/block/sda/sda1/trace/enable
-	    echo blk > /sys/kernel/debug/tracing/current_tracer
-	    cat /sys/kernel/debug/tracing/trace_pipe
-
 	  If unsure, say N.
 
 config BLK_DEV_BSG