From a07adceb8edc1f013817d1a14d08b351f236452b Mon Sep 17 00:00:00 2001 From: Li Zefan Date: Thu, 9 Dec 2010 15:47:56 +0800 Subject: [PATCH] --- yaml --- r: 228947 b: refs/heads/master c: 1dbd1951f39e13da579ffe879cce19586d0462de h: refs/heads/master i: 228945: 54f76021c8367559173e04ed8b6657b18b985c49 228943: 4ea96bd380c18337944770bf98ce2adca8ce5ca5 v: v3 --- [refs] | 2 +- trunk/kernel/trace/trace.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 9f728f3eb89c..4a224389e98c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bd1c8b22b7b81c6f6c4f5c19cb2387da3d02fb0f +refs/heads/master: 1dbd1951f39e13da579ffe879cce19586d0462de diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c index f8cf959bad45..dc53ecb80589 100644 --- a/trunk/kernel/trace/trace.c +++ b/trunk/kernel/trace/trace.c @@ -1313,12 +1313,10 @@ ftrace_trace_userstack(struct ring_buffer *buffer, unsigned long flags, int pc) __this_cpu_inc(user_stack_count); - - event = trace_buffer_lock_reserve(buffer, TRACE_USER_STACK, sizeof(*entry), flags, pc); if (!event) - return; + goto out_drop_count; entry = ring_buffer_event_data(event); entry->tgid = current->tgid; @@ -1333,8 +1331,8 @@ ftrace_trace_userstack(struct ring_buffer *buffer, unsigned long flags, int pc) if (!filter_check_discard(call, entry, buffer, event)) ring_buffer_unlock_commit(buffer, event); + out_drop_count: __this_cpu_dec(user_stack_count); - out: preempt_enable(); }