diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-15 22:47:48 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-15 22:47:48 -0500 |
| commit | 3d8b4bdef7e7c9d36ce90e563788c10051a91c34 (patch) | |
| tree | f98e4fc7cce54ea0b4b4466342c3ee06f9a7a9f7 /kernel/perf_event.c | |
| parent | 724e6d3fe8003c3f60bf404bf22e4e331327c596 (diff) | |
| parent | 1a72cfa6856e7d58e049c42c6e6a789669478479 (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:
perf top: Fix help text alignment
perf: Fix hypervisor sample reporting
perf: Make bp_len type to u64 generic across the arch
Diffstat (limited to 'kernel/perf_event.c')
| -rw-r--r-- | kernel/perf_event.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/perf_event.c b/kernel/perf_event.c index d27746bd3a06..2b19297742cb 100644 --- a/kernel/perf_event.c +++ b/kernel/perf_event.c | |||
| @@ -4580,7 +4580,7 @@ static int perf_copy_attr(struct perf_event_attr __user *uattr, | |||
| 4580 | if (attr->type >= PERF_TYPE_MAX) | 4580 | if (attr->type >= PERF_TYPE_MAX) |
| 4581 | return -EINVAL; | 4581 | return -EINVAL; |
| 4582 | 4582 | ||
| 4583 | if (attr->__reserved_1 || attr->__reserved_2) | 4583 | if (attr->__reserved_1) |
| 4584 | return -EINVAL; | 4584 | return -EINVAL; |
| 4585 | 4585 | ||
| 4586 | if (attr->sample_type & ~(PERF_SAMPLE_MAX-1)) | 4586 | if (attr->sample_type & ~(PERF_SAMPLE_MAX-1)) |