diff options
| author | Matthew Garrett <mjg@redhat.com> | 2010-05-17 12:11:21 -0400 |
|---|---|---|
| committer | Matthew Garrett <mjg@redhat.com> | 2010-05-17 12:11:21 -0400 |
| commit | a1e66dd0515c8cfa72b8e2a3834d59548cf84ba5 (patch) | |
| tree | e1e1edf210c8dde6edbdfa32ed6ff59ac553729b /tools/perf/util/trace-event-parse.c | |
| parent | d89d63a973986bf6c1d8b28ab62eb61491a3bb34 (diff) | |
| parent | 6c62673cf58516e1b82329ac90ebf3ff3f485672 (diff) | |
Merge branch 'x86-platform-next' into x86-platform
Diffstat (limited to 'tools/perf/util/trace-event-parse.c')
| -rw-r--r-- | tools/perf/util/trace-event-parse.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-event-parse.c index 9b3c20f42f98..613c9cc90570 100644 --- a/tools/perf/util/trace-event-parse.c +++ b/tools/perf/util/trace-event-parse.c | |||
| @@ -1925,7 +1925,7 @@ void *raw_field_ptr(struct event *event, const char *name, void *data) | |||
| 1925 | if (!field) | 1925 | if (!field) |
| 1926 | return NULL; | 1926 | return NULL; |
| 1927 | 1927 | ||
| 1928 | if (field->flags & FIELD_IS_STRING) { | 1928 | if (field->flags & FIELD_IS_DYNAMIC) { |
| 1929 | int offset; | 1929 | int offset; |
| 1930 | 1930 | ||
| 1931 | offset = *(int *)(data + field->offset); | 1931 | offset = *(int *)(data + field->offset); |