diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-11 17:37:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-11 17:37:24 -0700 |
| commit | b2464ab2023f20aea23ef8df1cb45b338c859ea5 (patch) | |
| tree | f19c0b09cfb79559274e499e21ca7c29a8a3fdba /tools/perf/util | |
| parent | drivers/gpu/drm/i915/i915_irq.c:i915_error_object_create(): use correct kmap-atomic slot (diff) | |
| parent | kprobes/x86: Fix removed int3 checking order (diff) | |
| download | linux-dev-b2464ab2023f20aea23ef8df1cb45b338c859ea5.tar.xz linux-dev-b2464ab2023f20aea23ef8df1cb45b338c859ea5.zip | |
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/util')
| -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) if (!field) return NULL; - if (field->flags & FIELD_IS_STRING) { + if (field->flags & FIELD_IS_DYNAMIC) { int offset; offset = *(int *)(data + field->offset); |