diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2011-04-27 10:38:30 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-04-27 10:40:21 +0200 |
| commit | 32673822e440eb92eb334631eb0a199d0c532d13 (patch) | |
| tree | c1e55c1793fa17937d9b8e0a9a2946583f1948d5 /kernel/perf_event.c | |
| parent | perf events, x86, P4: Fix typo in comment (diff) | |
| parent | jump label: Add s390 support (diff) | |
| download | linux-dev-32673822e440eb92eb334631eb0a199d0c532d13.tar.xz linux-dev-32673822e440eb92eb334631eb0a199d0c532d13.zip | |
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
Conflicts:
include/linux/perf_event.h
Merge reason: pick up the latest jump-label enhancements, they are cooked ready.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/perf_event.c')
| -rw-r--r-- | kernel/perf_event.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/perf_event.c b/kernel/perf_event.c index 8e81a9860a0d..440bc485bbff 100644 --- a/kernel/perf_event.c +++ b/kernel/perf_event.c @@ -125,7 +125,7 @@ enum event_type_t { * perf_sched_events : >0 events exist * perf_cgroup_events: >0 per-cpu cgroup events exist on this cpu */ -atomic_t perf_sched_events __read_mostly; +struct jump_label_key perf_sched_events __read_mostly; static DEFINE_PER_CPU(atomic_t, perf_cgroup_events); static atomic_t nr_mmap_events __read_mostly; @@ -5429,7 +5429,7 @@ fail: return err; } -atomic_t perf_swevent_enabled[PERF_COUNT_SW_MAX]; +struct jump_label_key perf_swevent_enabled[PERF_COUNT_SW_MAX]; static void sw_perf_event_destroy(struct perf_event *event) { |