diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-18 11:48:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-18 11:48:48 -0700 |
| commit | a0a6a39ecb11cefe0d7e6e07997306fb5ab2b07e (patch) | |
| tree | 35dfe4099b54dbc6971ef115c2e4d39cefd24413 /arch/powerpc/perf/core-book3s.c | |
| parent | bab58350e565756df9e45daafe8301a309b35e7e (diff) | |
| parent | 83dac59409387789b88bed40b1be86a8abc572be (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
Pull powerpc fixes from Benjamin Herrenschmidt:
"Here are a handful of powerpc related fixes."
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
cpuidle/powerpc: Fix snooze state problem in the cpuidle design on pseries.
cpuidle/powerpc: Fix smt_snooze_delay functionality.
cpuidle/powerpc: Fix target residency initialisation in pseries cpuidle
powerpc: Build fix for powerpc KVM
Revert "powerpc/perf: Use pmc_overflow() to detect rolled back events"
Diffstat (limited to 'arch/powerpc/perf/core-book3s.c')
| -rw-r--r-- | arch/powerpc/perf/core-book3s.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/perf/core-book3s.c b/arch/powerpc/perf/core-book3s.c index 0db88f501f9..aa2465e21f1 100644 --- a/arch/powerpc/perf/core-book3s.c +++ b/arch/powerpc/perf/core-book3s.c @@ -1463,7 +1463,7 @@ static void perf_event_interrupt(struct pt_regs *regs) if (!event->hw.idx || is_limited_pmc(event->hw.idx)) continue; val = read_pmc(event->hw.idx); - if (pmc_overflow(val)) { + if ((int)val < 0) { /* event has overflowed */ found = 1; record_and_restart(event, val, regs); |