Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf: Do no try to schedule task events if there are none
lockdep, kmemcheck: Annotate ->lock in lockdep_init_map()
perf header: Use event_name() to get an event name
perf stat: Failure with "Operation not supported"
+12
-5
+2
-2
kernel/events/core.c
+2
-2
kernel/events/core.c
···
2174
2174
*/
2175
2175
cpu_ctx_sched_out(cpuctx, EVENT_FLEXIBLE);
2176
2176
2177
-
perf_event_sched_in(cpuctx, ctx, task);
2178
-
2179
2177
if (ctx->nr_events)
2180
2178
cpuctx->task_ctx = ctx;
2179
+
2180
+
perf_event_sched_in(cpuctx, cpuctx->task_ctx, task);
2181
2181
2182
2182
perf_pmu_enable(ctx->pmu);
2183
2183
perf_ctx_unlock(cpuctx, ctx);
+7
-1
kernel/lockdep.c
+7
-1
kernel/lockdep.c
···
44
44
#include <linux/stringify.h>
45
45
#include <linux/bitops.h>
46
46
#include <linux/gfp.h>
47
+
#include <linux/kmemcheck.h>
47
48
48
49
#include <asm/sections.h>
49
50
···
2949
2948
void lockdep_init_map(struct lockdep_map *lock, const char *name,
2950
2949
struct lock_class_key *key, int subclass)
2951
2950
{
2952
-
memset(lock, 0, sizeof(*lock));
2951
+
int i;
2952
+
2953
+
kmemcheck_mark_initialized(lock, sizeof(*lock));
2954
+
2955
+
for (i = 0; i < NR_LOCKDEP_CACHING_CLASSES; i++)
2956
+
lock->class_cache[i] = NULL;
2953
2957
2954
2958
#ifdef CONFIG_LOCK_STAT
2955
2959
lock->cpu = raw_smp_processor_id();
+2
-1
tools/perf/builtin-stat.c
+2
-1
tools/perf/builtin-stat.c
···
463
463
464
464
list_for_each_entry(counter, &evsel_list->entries, node) {
465
465
if (create_perf_stat_counter(counter, first) < 0) {
466
-
if (errno == EINVAL || errno == ENOSYS || errno == ENOENT) {
466
+
if (errno == EINVAL || errno == ENOSYS ||
467
+
errno == ENOENT || errno == EOPNOTSUPP) {
467
468
if (verbose)
468
469
ui__warning("%s event is not supported by the kernel.\n",
469
470
event_name(counter));