perf fixes
Linus,
Please pull the latest perf-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git perf-fixes-for-linus
Thanks,
Ingo
------------------>
Anton Blanchard (1):
perf: Fix hypervisor sample reporting
Kirill Smelkov (1):
perf top: Fix help text alignment
Mahesh Salgaonkar (1):
perf: Make bp_len type to u64 generic across the arch
include/linux/hw_breakpoint.h | 2 +- include/linux/perf_event.h | 6 ++---- kernel/hw_breakpoint.c | 2 +- kernel/perf_event.c | 2 +- tools/perf/builtin-top.c | 2 +- tools/perf/util/event.c | 4 ++-- 6 files changed, 8 insertions(+), 10 deletions(-)
include/linux/hw_breakpoint.h +1 -1
@@ -44,7 +44,7 @@ static inline int hw_breakpoint_type(struct perf_event *bp)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; }
include/linux/perf_event.h +2 -4
@@ -211,11 +211,9 @@ struct perf_event_attr {__u32 wakeup_watermark;/* bytes before wakeup */ }; -__u32 __reserved_2; - -__u64 bp_addr;__u32 bp_type; -__u32 bp_len; +__u64 bp_addr; +__u64 bp_len; };/*
kernel/hw_breakpoint.c +1 -1
@@ -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) {u64 old_addr = bp->attr.bp_addr; +u64 old_len = bp->attr.bp_len;int old_type = bp->attr.bp_type; -int old_len = bp->attr.bp_len;int err =0 ;perf_event_disable (bp);
kernel/perf_event.c +1 -1
@@ -4580,7 +4580,7 @@ static int perf_copy_attr(struct perf_event_attr __user *uattr,if (attr->type >=PERF_TYPE_MAX )return -EINVAL ; -if (attr->__reserved_1 || attr->__reserved_2) +if (attr->__reserved_1)return -EINVAL ;if (attr->sample_type & ~(PERF_SAMPLE_MAX -1 ))
tools/perf/builtin-top.c +1 -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[K] hide kernel_symbols symbols. \t(%s)\n" , +"\t[K] hide kernel_symbols symbols. \t(%s)\n" , hide_kernel_symbols ?"yes" :"no" ); fprintf(stdout, "\t[U] hide user symbols. \t(%s)\n",
tools/perf/util/event.c +2 -2
@@ -295,10 +295,10 @@ void thread__find_addr_location(struct thread *self, al->thread = self; al->addr = addr; -if (cpumode &PERF_RECORD_MISC_KERNEL ) { +if (cpumode ==PERF_RECORD_MISC_KERNEL ) { al->level ='k' ; mg = &session->kmaps; - }else if (cpumode &PERF_RECORD_MISC_USER ) + }else if (cpumode ==PERF_RECORD_MISC_USER ) al->level ='.' ;else { al->level ='H' ;