diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-28 16:27:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-28 16:27:16 -0700 |
| commit | b49c3170bf2803329c0daff8e386e08f50f1729d (patch) | |
| tree | 81749e52e9c000b76b17d098b566bcd1b77d4d2a /arch/powerpc | |
| parent | ed99d3673e082b78b20208f346d2cd375483a779 (diff) | |
| parent | f92b7604149a55cb601fc0b52911b1e11f0f2514 (diff) | |
| download | talos-obmc-linux-b49c3170bf2803329c0daff8e386e08f50f1729d.tar.gz talos-obmc-linux-b49c3170bf2803329c0daff8e386e08f50f1729d.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 kernel fixes: a virtualization environment related fix, an uncore
PMU driver removal handling fix, a PowerPC fix and new events for
Knights Landing"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf/x86/intel: Honour the CPUID for number of fixed counters in hypervisors
perf/powerpc: Don't call perf_event_disable() from atomic context
perf/core: Protect PMU device removal with a 'pmu_bus_running' check, to fix CONFIG_DEBUG_TEST_DRIVER_REMOVE=y kernel panic
perf/x86/intel/cstate: Add C-state residency events for Knights Landing
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/kernel/hw_breakpoint.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/hw_breakpoint.c b/arch/powerpc/kernel/hw_breakpoint.c index 9781c69eae57..03d089b3ed72 100644 --- a/arch/powerpc/kernel/hw_breakpoint.c +++ b/arch/powerpc/kernel/hw_breakpoint.c @@ -275,7 +275,7 @@ int hw_breakpoint_handler(struct die_args *args) if (!stepped) { WARN(1, "Unable to handle hardware breakpoint. Breakpoint at " "0x%lx will be disabled.", info->address); - perf_event_disable(bp); + perf_event_disable_inatomic(bp); goto out; } /* |
