diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-11 20:37:24 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-11 20:37:24 -0400 |
| commit | b2464ab2023f20aea23ef8df1cb45b338c859ea5 (patch) | |
| tree | f19c0b09cfb79559274e499e21ca7c29a8a3fdba /tools/perf | |
| parent | 788885ae7a298dec73ba999c2fc5d46d42072ddf (diff) | |
| parent | 829e92458532b1dbfeb972435d45bb060cdbf5a3 (diff) | |
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
kprobes/x86: Fix removed int3 checking order
perf: Fix static strings treated like dynamic ones
Diffstat (limited to 'tools/perf')
| -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); |