diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-10 09:30:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-10 09:30:09 -0700 |
| commit | 85ca7886f566ae387a57a37bc0ffab25e3e117b5 (patch) | |
| tree | d170966b3352b3463669492648861795aad0fb92 /kernel | |
| parent | 7c8d20d40f29e7c08332d406d7a65678dece4627 (diff) | |
| parent | 16106822b67e0a5eb228aebf47e33d6cad1e91b6 (diff) | |
| download | linux-85ca7886f566ae387a57a37bc0ffab25e3e117b5.tar.gz | |
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: tracing: Fix null pointer deref with SEND_SIG_FORCED perf: Fix signed comparison in perf_adjust_period() powerpc/oprofile: fix potential buffer overrun in op_model_cell.c perf symbols: Set the DSO long name when using symbol_conf.vmlinux_name
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/perf_event.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/perf_event.c b/kernel/perf_event.c index 31d6afe92594..ff86c558af4c 100644 --- a/kernel/perf_event.c +++ b/kernel/perf_event.c @@ -1507,6 +1507,9 @@ do { \ divisor = nsec * frequency; } + if (!divisor) + return dividend; + return div64_u64(dividend, divisor); } @@ -1529,7 +1532,7 @@ static int perf_event_start(struct perf_event *event) static void perf_adjust_period(struct perf_event *event, u64 nsec, u64 count) { struct hw_perf_event *hwc = &event->hw; - u64 period, sample_period; + s64 period, sample_period; s64 delta; period = perf_calculate_period(event, nsec, count); |