summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--kernel/trace/trace.h4
-rw-r--r--kernel/trace/trace_events.c20
2 files changed, 5 insertions, 19 deletions
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index b825ea2..e420f2a 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -887,8 +887,8 @@ enum {
struct ftrace_event_field {
struct list_head link;
- char *name;
- char *type;
+ const char *name;
+ const char *type;
int filter_type;
int offset;
int size;
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index 5d8845d..63b4bdf 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -72,13 +72,8 @@ static int __trace_define_field(struct list_head *head, const char *type,
if (!field)
goto err;
- field->name = kstrdup(name, GFP_KERNEL);
- if (!field->name)
- goto err;
-
- field->type = kstrdup(type, GFP_KERNEL);
- if (!field->type)
- goto err;
+ field->name = name;
+ field->type = type;
if (filter_type == FILTER_OTHER)
field->filter_type = filter_assign_type(type);
@@ -94,8 +89,6 @@ static int __trace_define_field(struct list_head *head, const char *type,
return 0;
err:
- if (field)
- kfree(field->name);
kmem_cache_free(field_cachep, field);
return -ENOMEM;
@@ -146,8 +139,6 @@ void trace_destroy_fields(struct ftrace_event_call *call)
head = trace_get_fields(call);
list_for_each_entry_safe(field, next, head, link) {
list_del(&field->link);
- kfree(field->type);
- kfree(field->name);
kmem_cache_free(field_cachep, field);
}
}
@@ -286,7 +277,6 @@ static void __put_system(struct event_subsystem *system)
kfree(filter->filter_string);
kfree(filter);
}
- kfree(system->name);
kfree(system);
}
@@ -1202,10 +1192,7 @@ create_new_subsystem(const char *name)
return NULL;
system->ref_count = 1;
- system->name = kstrdup(name, GFP_KERNEL);
-
- if (!system->name)
- goto out_free;
+ system->name = name;
system->filter = NULL;
@@ -1218,7 +1205,6 @@ create_new_subsystem(const char *name)
return system;
out_free:
- kfree(system->name);
kfree(system);
return NULL;
}