---

yaml --- r: 140662 b: refs/heads/master c: 9005f3e h: refs/heads/master v: v3
git-mirror · Jan 23, 2009 · e8e49b0 · e8e49b0
1 parent 268e7c9
commit e8e49b0
Show file tree

Hide file tree

Showing 7 changed files with 240 additions and 130 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e49fcce1bdadd723ae6a0b3b324c4daced61563
+refs/heads/master: 9005f3ebebfcfe9ccd731d16c468907a35ac1f9a
diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h
@@ -137,8 +137,6 @@ extern unsigned long nr_uninterruptible(void);
 extern unsigned long nr_active(void);
 extern unsigned long nr_iowait(void);
 
-extern unsigned long get_parent_ip(unsigned long addr);
-
 struct seq_file;
 struct cfs_rq;
 struct task_group;

diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
@@ -4399,7 +4399,10 @@ void scheduler_tick(void)
 #endif
 }
 
-unsigned long get_parent_ip(unsigned long addr)
+#if defined(CONFIG_PREEMPT) && (defined(CONFIG_DEBUG_PREEMPT) || \
+				defined(CONFIG_PREEMPT_TRACER))
+
+static inline unsigned long get_parent_ip(unsigned long addr)
 {
 	if (in_lock_functions(addr)) {
 		addr = CALLER_ADDR2;
@@ -4409,9 +4412,6 @@ unsigned long get_parent_ip(unsigned long addr)
 	return addr;
 }
 
-#if defined(CONFIG_PREEMPT) && (defined(CONFIG_DEBUG_PREEMPT) || \
-				defined(CONFIG_PREEMPT_TRACER))
-
 void __kprobes add_preempt_count(int val)
 {
 #ifdef CONFIG_DEBUG_PREEMPT

diff --git a/trunk/kernel/softirq.c b/trunk/kernel/softirq.c
@@ -21,7 +21,6 @@
 #include <linux/freezer.h>
 #include <linux/kthread.h>
 #include <linux/rcupdate.h>
-#include <linux/ftrace.h>
 #include <linux/smp.h>
 #include <linux/tick.h>
 
@@ -80,23 +79,13 @@ static void __local_bh_disable(unsigned long ip)
 	WARN_ON_ONCE(in_irq());
 
 	raw_local_irq_save(flags);
-	/*
-	 * The preempt tracer hooks into add_preempt_count and will break
-	 * lockdep because it calls back into lockdep after SOFTIRQ_OFFSET
-	 * is set and before current->softirq_enabled is cleared.
-	 * We must manually increment preempt_count here and manually
-	 * call the trace_preempt_off later.
-	 */
-	preempt_count() += SOFTIRQ_OFFSET;
+	add_preempt_count(SOFTIRQ_OFFSET);
 	/*
 	 * Were softirqs turned off above:
 	 */
 	if (softirq_count() == SOFTIRQ_OFFSET)
 		trace_softirqs_off(ip);
 	raw_local_irq_restore(flags);
-
-	if (preempt_count() == SOFTIRQ_OFFSET)
-		trace_preempt_off(CALLER_ADDR0, get_parent_ip(CALLER_ADDR1));
 }
 #else /* !CONFIG_TRACE_IRQFLAGS */
 static inline void __local_bh_disable(unsigned long ip)

diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c
@@ -610,12 +610,13 @@ void tracing_start(void)
 		return;
 
 	spin_lock_irqsave(&tracing_start_lock, flags);
-	if (--trace_stop_count) {
-		if (trace_stop_count < 0) {
-			/* Someone screwed up their debugging */
-			WARN_ON_ONCE(1);
-			trace_stop_count = 0;
-		}
+	if (--trace_stop_count)
+		goto out;
+
+	if (trace_stop_count < 0) {
+		/* Someone screwed up their debugging */
+		WARN_ON_ONCE(1);
+		trace_stop_count = 0;
 		goto out;
 	}