perf fixes
Linus,
Please pull the latest perf-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf-urgent-for-linus
Thanks,
Ingo
------------------>
Andrew Vagin (1):
perf header: Use event_name() to get an event name
Anton Blanchard (1):
perf stat: Failure with "Operation not supported"
Gleb Natapov (1):
perf: Do no try to schedule task events if there are none
Yong Zhang (1):
lockdep, kmemcheck: Annotate ->lock in lockdep_init_map()
kernel/events/core.c | 4 ++-- kernel/lockdep.c | 8 +++++++- tools/perf/builtin-stat.c | 3 ++- tools/perf/util/header.c | 2 +- 4 files changed, 12 insertions(+), 5 deletions(-)
kernel/events/core.c +2 -2
@@ -2174,11 +2174,11 @@ static void perf_event_context_sched_in(struct perf_event_context *ctx,*/ cpu_ctx_sched_out (cpuctx,EVENT_FLEXIBLE ); -perf_event_sched_in (cpuctx, ctx, task); -if (ctx->nr_events) cpuctx->task_ctx = ctx; +perf_event_sched_in (cpuctx, cpuctx->task_ctx, task); +perf_pmu_enable (ctx->pmu);perf_ctx_unlock (cpuctx, ctx);
kernel/lockdep.c +7 -1
@@ -44,6 +44,7 @@#include <linux/stringify.h> #include <linux/bitops.h> #include <linux/gfp.h> +#include <linux/kmemcheck.h> #include <asm/sections.h>
@@ -2948,7 +2949,12 @@ static int mark_lock(struct task_struct *curr, struct held_lock *this,void lockdep_init_map (struct lockdep_map *lock,const char *name,struct lock_class_key *key,int subclass) { -memset (lock,0 ,sizeof (*lock)); +int i; + +kmemcheck_mark_initialized (lock,sizeof (*lock)); + +for (i =0 ; i <NR_LOCKDEP_CACHING_CLASSES ; i++) + lock->class_cache[i] =NULL ;#ifdef CONFIG_LOCK_STAT lock->cpu =raw_smp_processor_id ();
tools/perf/builtin-stat.c +2 -1
@@ -463,7 +463,8 @@ static int run_perf_stat(int argc __used, const char **argv)list_for_each_entry (counter, &evsel_list->entries, node) {if (create_perf_stat_counter (counter, first) <0 ) { -if (errno ==EINVAL || errno ==ENOSYS || errno ==ENOENT ) { +if (errno ==EINVAL || errno ==ENOSYS || + errno ==ENOENT || errno ==EOPNOTSUPP ) {if (verbose)ui__warning ("%s event is not supported by the kernel.\n" ,event_name (counter));
tools/perf/util/header.c +1 -1
@@ -388,7 +388,7 @@ static int write_event_desc(int fd, struct perf_header *h __used,/* * write event string as passed on cmdline */ - ret =do_write_string (fd, attr->name); + ret =do_write_string (fd,event_name (attr));if (ret <0 )return ret;/*