git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 2:
238c1a7
)
Merge branch 'for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile...
author
Ingo Molnar
<mingo@elte.hu>
Tue, 8 Jun 2010 17:15:37 +0000
(19:15 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Tue, 8 Jun 2010 17:15:37 +0000
(19:15 +0200)
kernel/perf_event.c
patch
|
blob
|
history
diff --git
a/kernel/perf_event.c
b/kernel/perf_event.c
index
31d6afe
..
ff86c55
100644
(file)
--- 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;
-
u
64 period, sample_period;
+
s
64 period, sample_period;
s64 delta;
period = perf_calculate_period(event, nsec, count);