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
This commit is contained in:
commit
3d8b4bdef7
|
@ -44,7 +44,7 @@ static inline int hw_breakpoint_type(struct perf_event *bp)
|
||||||
return bp->attr.bp_type;
|
return bp->attr.bp_type;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline int hw_breakpoint_len(struct perf_event *bp)
|
static inline unsigned long hw_breakpoint_len(struct perf_event *bp)
|
||||||
{
|
{
|
||||||
return bp->attr.bp_len;
|
return bp->attr.bp_len;
|
||||||
}
|
}
|
||||||
|
|
|
@ -211,11 +211,9 @@ struct perf_event_attr {
|
||||||
__u32 wakeup_watermark; /* bytes before wakeup */
|
__u32 wakeup_watermark; /* bytes before wakeup */
|
||||||
};
|
};
|
||||||
|
|
||||||
__u32 __reserved_2;
|
|
||||||
|
|
||||||
__u64 bp_addr;
|
|
||||||
__u32 bp_type;
|
__u32 bp_type;
|
||||||
__u32 bp_len;
|
__u64 bp_addr;
|
||||||
|
__u64 bp_len;
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -360,8 +360,8 @@ EXPORT_SYMBOL_GPL(register_user_hw_breakpoint);
|
||||||
int modify_user_hw_breakpoint(struct perf_event *bp, struct perf_event_attr *attr)
|
int modify_user_hw_breakpoint(struct perf_event *bp, struct perf_event_attr *attr)
|
||||||
{
|
{
|
||||||
u64 old_addr = bp->attr.bp_addr;
|
u64 old_addr = bp->attr.bp_addr;
|
||||||
|
u64 old_len = bp->attr.bp_len;
|
||||||
int old_type = bp->attr.bp_type;
|
int old_type = bp->attr.bp_type;
|
||||||
int old_len = bp->attr.bp_len;
|
|
||||||
int err = 0;
|
int err = 0;
|
||||||
|
|
||||||
perf_event_disable(bp);
|
perf_event_disable(bp);
|
||||||
|
|
|
@ -4580,7 +4580,7 @@ static int perf_copy_attr(struct perf_event_attr __user *uattr,
|
||||||
if (attr->type >= PERF_TYPE_MAX)
|
if (attr->type >= PERF_TYPE_MAX)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
if (attr->__reserved_1 || attr->__reserved_2)
|
if (attr->__reserved_1)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
if (attr->sample_type & ~(PERF_SAMPLE_MAX-1))
|
if (attr->sample_type & ~(PERF_SAMPLE_MAX-1))
|
||||||
|
|
|
@ -705,7 +705,7 @@ static void print_mapped_keys(void)
|
||||||
fprintf(stdout, "\t[w] toggle display weighted/count[E]r. \t(%d)\n", display_weighted ? 1 : 0);
|
fprintf(stdout, "\t[w] toggle display weighted/count[E]r. \t(%d)\n", display_weighted ? 1 : 0);
|
||||||
|
|
||||||
fprintf(stdout,
|
fprintf(stdout,
|
||||||
"\t[K] hide kernel_symbols symbols. \t(%s)\n",
|
"\t[K] hide kernel_symbols symbols. \t(%s)\n",
|
||||||
hide_kernel_symbols ? "yes" : "no");
|
hide_kernel_symbols ? "yes" : "no");
|
||||||
fprintf(stdout,
|
fprintf(stdout,
|
||||||
"\t[U] hide user symbols. \t(%s)\n",
|
"\t[U] hide user symbols. \t(%s)\n",
|
||||||
|
|
|
@ -295,10 +295,10 @@ void thread__find_addr_location(struct thread *self,
|
||||||
al->thread = self;
|
al->thread = self;
|
||||||
al->addr = addr;
|
al->addr = addr;
|
||||||
|
|
||||||
if (cpumode & PERF_RECORD_MISC_KERNEL) {
|
if (cpumode == PERF_RECORD_MISC_KERNEL) {
|
||||||
al->level = 'k';
|
al->level = 'k';
|
||||||
mg = &session->kmaps;
|
mg = &session->kmaps;
|
||||||
} else if (cpumode & PERF_RECORD_MISC_USER)
|
} else if (cpumode == PERF_RECORD_MISC_USER)
|
||||||
al->level = '.';
|
al->level = '.';
|
||||||
else {
|
else {
|
||||||
al->level = 'H';
|
al->level = 'H';
|
||||||
|
|
Reference in New Issue