From 9649a0012e9d71c745ef6141f1de80be1fb93672 Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Mon, 20 Apr 2009 13:24:21 -0400 Subject: [PATCH] --- yaml --- r: 146043 b: refs/heads/master c: 17487bfeb6cfb05920e6a9d5a54f345f2917b4e7 h: refs/heads/master i: 146041: 144c51314864bc32cf6acf1365c4a540e16c4084 146039: 8bb2f1500cb97fc0233e48288634cdc042d9d6e7 v: v3 --- [refs] | 2 +- trunk/kernel/trace/ring_buffer.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6a6ffc22e99b..a0d5b356185e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 23de29de2d8b227943be191d59fb6d983996d55e +refs/heads/master: 17487bfeb6cfb05920e6a9d5a54f345f2917b4e7 diff --git a/trunk/kernel/trace/ring_buffer.c b/trunk/kernel/trace/ring_buffer.c index e145969a8eda..aa40ae92233b 100644 --- a/trunk/kernel/trace/ring_buffer.c +++ b/trunk/kernel/trace/ring_buffer.c @@ -1483,7 +1483,9 @@ rb_reserve_next_event(struct ring_buffer_per_cpu *cpu_buffer, static int trace_irq_level(void) { - return hardirq_count() + softirq_count() + in_nmi(); + return (hardirq_count() >> HARDIRQ_SHIFT) + + (softirq_count() >> + SOFTIRQ_SHIFT) + + !!in_nmi(); } static int trace_recursive_lock(void)