Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[pandora-kernel.git] / tools / perf / util / trace-event-parse.c

diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-event-parse.c
index c5c32be..9b3c20f 100644 (file)
--- a/tools/perf/util/trace-event-parse.c
+++ b/tools/perf/util/trace-event-parse.c
@@ -1925,6 +1925,15 @@ void *raw_field_ptr(struct event *event, const char *name, void *data)
        if (!field)
                return NULL;
 
+       if (field->flags & FIELD_IS_STRING) {
+               int offset;
+
+               offset = *(int *)(data + field->offset);
+               offset &= 0xffff;
+
+               return data + offset;
+       }
+
        return data + field->offset;
 }
 
@@ -3277,3 +3286,18 @@ void parse_set_info(int nr_cpus, int long_sz)
        cpus = nr_cpus;
        long_size = long_sz;
 }
+
+int common_pc(struct scripting_context *context)
+{
+       return parse_common_pc(context->event_data);
+}
+
+int common_flags(struct scripting_context *context)
+{
+       return parse_common_flags(context->event_data);
+}
+
+int common_lock_depth(struct scripting_context *context)
+{
+       return parse_common_lock_depth(context->event_data);
+}