diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2014-03-16 10:41:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2014-03-16 10:41:21 -0700 |
| commit | b44eeb4d47b2a7e3e3494fff126b66338b360ce3 (patch) | |
| tree | 1680a39b12f848cdf277b00c2eb00932e446b45d /arch | |
| parent | ipc: Fix 2 bugs in msgrcv() MSG_COPY implementation (diff) | |
| parent | perf/x86: Fix leak in uncore_type_init failure paths (diff) | |
| download | linux-b44eeb4d47b2a7e3e3494fff126b66338b360ce3.tar.gz linux-b44eeb4d47b2a7e3e3494fff126b66338b360ce3.tar.bz2 linux-b44eeb4d47b2a7e3e3494fff126b66338b360ce3.zip | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar:
"Misc smaller fixes"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf/x86: Fix leak in uncore_type_init failure paths
perf machine: Use map as success in ip__resolve_ams
perf symbols: Fix crash in elf_section_by_name
perf trace: Decode architecture-specific signal numbers
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/cpu/perf_event_intel_uncore.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c b/arch/x86/kernel/cpu/perf_event_intel_uncore.c index c88f7f4b03ee..047f540cf3f7 100644 --- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c +++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c @@ -3334,6 +3334,8 @@ static int __init uncore_type_init(struct intel_uncore_type *type) if (!pmus) return -ENOMEM; + type->pmus = pmus; + type->unconstrainted = (struct event_constraint) __EVENT_CONSTRAINT(0, (1ULL << type->num_counters) - 1, 0, type->num_counters, 0, 0); @@ -3369,7 +3371,6 @@ static int __init uncore_type_init(struct intel_uncore_type *type) } type->pmu_group = &uncore_pmu_attr_group; - type->pmus = pmus; return 0; fail: uncore_type_exit(type); |