diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-18 11:04:30 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-18 11:04:30 -0500 |
| commit | c6fa63c659b3dd121f21afe7529f505505e79b23 (patch) | |
| tree | 1ad782e1fa623416efce7a6525248b54458d5f7c /arch | |
| parent | 34c682adb30e9602e92f044056c142f69b4a6cfe (diff) | |
| parent | ad7f4e3f7b966ac09c8f98dbc5024813a1685775 (diff) | |
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
perf tools: Fix tracepoint id to string perf.data header table
perf tools: Fix handling of wildcards in tracepoint event selectors
powerpc: perf: Fix frequency calculation for overflowing counters
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/kernel/perf_event.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/perf_event.c b/arch/powerpc/kernel/perf_event.c index 567480705789..ab6f6beadb57 100644 --- a/arch/powerpc/kernel/perf_event.c +++ b/arch/powerpc/kernel/perf_event.c | |||
| @@ -1212,6 +1212,7 @@ static void record_and_restart(struct perf_event *event, unsigned long val, | |||
| 1212 | if (left <= 0) | 1212 | if (left <= 0) |
| 1213 | left = period; | 1213 | left = period; |
| 1214 | record = 1; | 1214 | record = 1; |
| 1215 | event->hw.last_period = event->hw.sample_period; | ||
| 1215 | } | 1216 | } |
| 1216 | if (left < 0x80000000LL) | 1217 | if (left < 0x80000000LL) |
| 1217 | val = 0x80000000LL - left; | 1218 | val = 0x80000000LL - left; |