From ca68452a4b4181ce05c672dcc9432b8444e65196 Mon Sep 17 00:00:00 2001 From: Scott Wood Date: Mon, 2 Aug 2010 17:17:18 -0500 Subject: [PATCH] --- yaml --- r: 205364 b: refs/heads/master c: 69e77a8b0426ded5d924eea7dbe4eca51e09f530 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/perf_event_fsl_emb.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index e60d761cfc49..05ff6c28c667 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 09f86cd093b76b699656eaa82c37ca6d9a02b892 +refs/heads/master: 69e77a8b0426ded5d924eea7dbe4eca51e09f530 diff --git a/trunk/arch/powerpc/kernel/perf_event_fsl_emb.c b/trunk/arch/powerpc/kernel/perf_event_fsl_emb.c index fc6a89b7f08e..1ba45471ae43 100644 --- a/trunk/arch/powerpc/kernel/perf_event_fsl_emb.c +++ b/trunk/arch/powerpc/kernel/perf_event_fsl_emb.c @@ -569,6 +569,7 @@ static void record_and_restart(struct perf_event *event, unsigned long val, struct perf_sample_data data; perf_sample_data_init(&data, 0); + data.period = event->hw.last_period; if (perf_event_overflow(event, nmi, &data, regs)) { /*