From patchwork Mon Aug 2 22:17:18 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Wood X-Patchwork-Id: 60690 X-Patchwork-Delegate: paulus@samba.org Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from bilbo.ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id 8E3D81009FD for ; Tue, 3 Aug 2010 08:32:39 +1000 (EST) Received: by ozlabs.org (Postfix) id E71EC1007D3; Tue, 3 Aug 2010 08:32:32 +1000 (EST) Delivered-To: linuxppc-dev@ozlabs.org X-Greylist: delayed 906 seconds by postgrey-1.32 at bilbo; Tue, 03 Aug 2010 08:32:32 EST Received: from VA3EHSOBE001.bigfish.com (va3ehsobe001.messaging.microsoft.com [216.32.180.11]) by ozlabs.org (Postfix) with ESMTP id 75CBB1007D2 for ; Tue, 3 Aug 2010 08:32:32 +1000 (EST) Received: from mail69-va3-R.bigfish.com (10.7.14.246) by VA3EHSOBE001.bigfish.com (10.7.40.21) with Microsoft SMTP Server id 8.1.340.0; Mon, 2 Aug 2010 22:17:23 +0000 Received: from mail69-va3 (localhost.localdomain [127.0.0.1]) by mail69-va3-R.bigfish.com (Postfix) with ESMTP id F08D4EA00BC for ; Mon, 2 Aug 2010 22:17:22 +0000 (UTC) X-SpamScore: 0 X-BigFish: VS0(zzzz1202hzzz2dh2a8h65h) X-Spam-TCS-SCL: 4:0 Received: from mail69-va3 (localhost.localdomain [127.0.0.1]) by mail69-va3 (MessageSwitch) id 1280787442852442_15867; Mon, 2 Aug 2010 22:17:22 +0000 (UTC) Received: from VA3EHSMHS036.bigfish.com (unknown [10.7.14.246]) by mail69-va3.bigfish.com (Postfix) with ESMTP id C405DF3004B for ; Mon, 2 Aug 2010 22:17:22 +0000 (UTC) Received: from az33egw02.freescale.net (192.88.158.103) by VA3EHSMHS036.bigfish.com (10.7.99.46) with Microsoft SMTP Server (TLS) id 14.0.482.44; Mon, 2 Aug 2010 22:17:20 +0000 Received: from az33smr02.freescale.net (az33smr02.freescale.net [10.64.34.200]) by az33egw02.freescale.net (8.14.3/8.14.3) with ESMTP id o72MHJYF023480 for ; Mon, 2 Aug 2010 15:17:19 -0700 (MST) Received: from az33exm25.fsl.freescale.net (az33exm25.am.freescale.net [10.64.32.16]) by az33smr02.freescale.net (8.13.1/8.13.0) with ESMTP id o72MHPAX010854 for ; Mon, 2 Aug 2010 17:17:25 -0500 (CDT) Received: from schlenkerla.am.freescale.net ([10.82.120.40]) by az33exm25.fsl.freescale.net with Microsoft SMTPSVC(6.0.3790.4675); Mon, 2 Aug 2010 15:17:18 -0700 Date: Mon, 2 Aug 2010 17:17:18 -0500 From: Scott Wood To: Paul Mackerras Subject: [PATCH] perf, powerpc: fsl_emb: Restore setting perf_sample_data.period Message-ID: <20100802221718.GA11003@schlenkerla.am.freescale.net> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) X-OriginalArrivalTime: 02 Aug 2010 22:17:19.0039 (UTC) FILETIME=[789C74F0:01CB3290] X-Reverse-DNS: az33egw02.freescale.net Cc: Peter Zijlstra , linuxppc-dev@ozlabs.org, linux-kernel@vger.kernel.org X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Commit 6b95ed345b9faa4ab3598a82991968f2e9f851bb changed from a struct initializer to perf_sample_data_init(), but the setting of the .period member was left out. Signed-off-by: Scott Wood --- arch/powerpc/kernel/perf_event_fsl_emb.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/arch/powerpc/kernel/perf_event_fsl_emb.c b/arch/powerpc/kernel/perf_event_fsl_emb.c index babccee..4339d20 100644 --- a/arch/powerpc/kernel/perf_event_fsl_emb.c +++ b/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)) { /*