summaryrefslogtreecommitdiffstats
path: root/kernel/perf_event.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2010-06-18 10:46:31 +0200
committerIngo Molnar <mingo@elte.hu>2010-06-18 10:46:35 +0200
commit4cb6948e5365ab874bb71ac35fb6b7c6dd305765 (patch)
tree0af0f44cce9043f3d66b7259536c6c99b790d9b0 /kernel/perf_event.c
parent89275d59b572b92b1e2f6ddb63c49deecb801ff9 (diff)
parent7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff)
downloadop-kernel-dev-4cb6948e5365ab874bb71ac35fb6b7c6dd305765.zip
op-kernel-dev-4cb6948e5365ab874bb71ac35fb6b7c6dd305765.tar.gz
Merge commit 'v2.6.35-rc3' into sched/core
Merge reason: Update to the latest -rc.
Diffstat (limited to 'kernel/perf_event.c')
-rw-r--r--kernel/perf_event.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/perf_event.c b/kernel/perf_event.c
index 109c5ec..7e32b51 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);
OpenPOWER on IntegriCloud