Merge tag 'trace-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux...

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / kernel / trace / trace_output.c

diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
index f475b2a7ac888794489a4b3ef58f2b4466f8dc3e..bb922d9ee51ba7b51171db284f6cd20576b012b2 100644 (file)
--- a/kernel/trace/trace_output.c
+++ b/kernel/trace/trace_output.c
@@ -781,12 +781,11 @@ static int task_state_char(unsigned long state)
 struct trace_event *ftrace_find_event(int type)
 {
        struct trace_event *event;
-       struct hlist_node *n;
        unsigned key;
 
        key = type & (EVENT_HASHSIZE - 1);
 
-       hlist_for_each_entry(event, n, &event_hash[key], node) {
+       hlist_for_each_entry(event, &event_hash[key], node) {
                if (event->type == type)
                        return event;
        }