Merge tag 'pm+acpi-3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[cascardo/linux.git] / kernel / trace / trace_events_filter.c

diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events_filter.c
index e5b0ca8..a636117 100644 (file)
--- a/kernel/trace/trace_events_filter.c
+++ b/kernel/trace/trace_events_filter.c
@@ -658,33 +658,6 @@ void print_subsystem_event_filter(struct event_subsystem *system,
        mutex_unlock(&event_mutex);
 }
 
-static struct ftrace_event_field *
-__find_event_field(struct list_head *head, char *name)
-{
-       struct ftrace_event_field *field;
-
-       list_for_each_entry(field, head, link) {
-               if (!strcmp(field->name, name))
-                       return field;
-       }
-
-       return NULL;
-}
-
-static struct ftrace_event_field *
-find_event_field(struct ftrace_event_call *call, char *name)
-{
-       struct ftrace_event_field *field;
-       struct list_head *head;
-
-       field = __find_event_field(&ftrace_common_fields, name);
-       if (field)
-               return field;
-
-       head = trace_get_fields(call);
-       return __find_event_field(head, name);
-}
-
 static int __alloc_pred_stack(struct pred_stack *stack, int n_preds)
 {
        stack->preds = kcalloc(n_preds + 1, sizeof(*stack->preds), GFP_KERNEL);
@@ -1337,7 +1310,7 @@ static struct filter_pred *create_pred(struct filter_parse_state *ps,
                return NULL;
        }
 
-       field = find_event_field(call, operand1);
+       field = trace_find_event_field(call, operand1);
        if (!field) {
                parse_error(ps, FILT_ERR_FIELD_NOT_FOUND, 0);
                return NULL;
@@ -1907,16 +1880,17 @@ out_unlock:
        return err;
 }
 
-int apply_subsystem_event_filter(struct event_subsystem *system,
+int apply_subsystem_event_filter(struct ftrace_subsystem_dir *dir,
                                 char *filter_string)
 {
+       struct event_subsystem *system = dir->subsystem;
        struct event_filter *filter;
        int err = 0;
 
        mutex_lock(&event_mutex);
 
        /* Make sure the system still has events */
-       if (!system->nr_events) {
+       if (!dir->nr_events) {
                err = -ENODEV;
                goto out_unlock;
        }