git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
[sfrench/cifs-2.6.git]
/
arch
/
powerpc
/
kernel
/
perf_event_fsl_emb.c
diff --git
a/arch/powerpc/kernel/perf_event_fsl_emb.c
b/arch/powerpc/kernel/perf_event_fsl_emb.c
index 4dcf5f831e9d01f8694443ac7d56146b6f7a9777..b0dc8f7069cd5fb7bb41ec8b2a3bd9a046f3f57e 100644
(file)
--- a/
arch/powerpc/kernel/perf_event_fsl_emb.c
+++ b/
arch/powerpc/kernel/perf_event_fsl_emb.c
@@
-596,6
+596,7
@@
static void record_and_restart(struct perf_event *event, unsigned long val,
if (left <= 0)
left = period;
record = 1;
+ event->hw.last_period = event->hw.sample_period;
}
if (left < 0x80000000LL)
val = 0x80000000LL - left;