From fb1970fee5ed9d53a7cdc07414386789fea56625 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 12 May 2008 21:20:49 +0200
Subject: [PATCH] --- yaml --- r: 100467 b: refs/heads/master c:
 2577046740fe6d77864128c6187c11125c2449ea h: refs/heads/master i:   100465:
 5eeacdda1187593b7af182a63320efe2afb4d517   100463:
 373352e0142996a1ef380f2ef2af4cb8252cd4e5 v: v3

---
 [refs]                     | 2 +-
 trunk/kernel/trace/trace.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5b96f74dbe14..17c672baa68e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e3ca0ec76fce92daa4eed0d02de9c79b1fe3920
+refs/heads/master: 2577046740fe6d77864128c6187c11125c2449ea
diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c
index 6974b212e938..958c4d77a67b 100644
--- a/trunk/kernel/trace/trace.c
+++ b/trunk/kernel/trace/trace.c
@@ -1965,7 +1965,9 @@ tracing_read_pipe(struct file *filp, char __user *ubuf,
 	static cpumask_t mask;
 	static int start;
 	unsigned long flags;
+#ifdef CONFIG_FTRACE
 	int ftrace_save;
+#endif
 	int read = 0;
 	int cpu;
 	int len;
@@ -2044,8 +2046,10 @@ tracing_read_pipe(struct file *filp, char __user *ubuf,
 
 	cpus_clear(mask);
 	local_irq_save(flags);
+#ifdef CONFIG_FTRACE
 	ftrace_save = ftrace_enabled;
 	ftrace_enabled = 0;
+#endif
 	smp_wmb();
 	for_each_possible_cpu(cpu) {
 		data = iter->tr->data[cpu];
@@ -2087,7 +2091,9 @@ tracing_read_pipe(struct file *filp, char __user *ubuf,
 		data = iter->tr->data[cpu];
 		atomic_dec(&data->disabled);
 	}
+#ifdef CONFIG_FTRACE
 	ftrace_enabled = ftrace_save;
+#endif
 	local_irq_restore(flags);
 
 	/* Now copy what we have to the user */