From patchwork Mon Sep 21 07:12:12 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Metzger X-Patchwork-Id: 33985 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 30FA4B7DC7 for ; Mon, 21 Sep 2009 20:09:22 +1000 (EST) Received: by ozlabs.org (Postfix) id 8D993B7B73; Mon, 21 Sep 2009 17:22:58 +1000 (EST) Delivered-To: linuxppc-dev@ozlabs.org X-Greylist: delayed 601 seconds by postgrey-1.32 at bilbo; Mon, 21 Sep 2009 17:22:58 EST Received: from mga03.intel.com (mga03.intel.com [143.182.124.21]) by ozlabs.org (Postfix) with ESMTP id 27773B7B6F for ; Mon, 21 Sep 2009 17:22:57 +1000 (EST) Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga101.ch.intel.com with ESMTP; 21 Sep 2009 00:12:55 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.44,423,1249282800"; d="scan'208";a="189772693" Received: from irsmsx601.ger.corp.intel.com ([163.33.7.164]) by azsmga001.ch.intel.com with ESMTP; 21 Sep 2009 00:12:53 -0700 Received: from irsmsx501.ger.corp.intel.com (163.33.7.70) by irsmsx601.ger.corp.intel.com (163.33.7.164) with Microsoft SMTP Server (TLS) id 8.1.358.0; Mon, 21 Sep 2009 08:12:16 +0100 Received: from irsmsx504.ger.corp.intel.com ([163.33.3.240]) by irsmsx501.ger.corp.intel.com ([163.33.7.70]) with mapi; Mon, 21 Sep 2009 08:12:15 +0100 From: "Metzger, Markus T" To: Paul Mackerras , Ingo Molnar , Peter Zijlstra , "davem@davemloft.net" Date: Mon, 21 Sep 2009 08:12:12 +0100 Subject: RE: [PATCH] perf_counter/powerpc: Fix compilation after perf_counter_overflow change Thread-Topic: [PATCH] perf_counter/powerpc: Fix compilation after perf_counter_overflow change Thread-Index: Aco6hwYcsAADLPU5RWeJbKdOGGqGtwAAwSpw Message-ID: <928CFBE8E7CB0040959E56B4EA41A77EC69BA5E0@irsmsx504.ger.corp.intel.com> References: <19127.8400.376239.586120@drongo.ozlabs.ibm.com> In-Reply-To: <19127.8400.376239.586120@drongo.ozlabs.ibm.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 X-Mailman-Approved-At: Mon, 21 Sep 2009 20:09:15 +1000 Cc: "linux-kernel@vger.kernel.org" , "linuxppc-dev@ozlabs.org" X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.12 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 >-----Original Message----- >From: Paul Mackerras [mailto:paulus@samba.org] >Sent: Monday, September 21, 2009 8:45 AM >Markus, please take care in future to mention it in the changelog if >your patches touch definitions used by other architectures. If you >could go so far as to use grep a bit more and fix up other >architectures' callsites for the things you're changing, that would be >very much appreciated. Thanks. I'm sorry I missed that. There's one more place in arch/sparc/. The below patch should fix it, but I have no means to test it. thanks and regards, markus. --------------------------------------------------------------------- Intel GmbH Dornacher Strasse 1 85622 Feldkirchen/Muenchen Germany Sitz der Gesellschaft: Feldkirchen bei Muenchen Geschaeftsfuehrer: Douglas Lusk, Peter Gleissner, Hannes Schwaderer Registergericht: Muenchen HRB 47456 Ust.-IdNr. VAT Registration No.: DE129385895 Citibank Frankfurt (BLZ 502 109 00) 600119052 This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies. Index: b/arch/sparc/kernel/perf_counter.c =================================================================== --- a/arch/sparc/kernel/perf_counter.c +++ b/arch/sparc/kernel/perf_counter.c @@ -493,7 +493,6 @@ static int __kprobes perf_counter_nmi_ha regs = args->regs; - data.regs = regs; data.addr = 0; cpuc = &__get_cpu_var(cpu_hw_counters); @@ -513,7 +512,7 @@ static int __kprobes perf_counter_nmi_ha if (!sparc_perf_counter_set_period(counter, hwc, idx)) continue; - if (perf_counter_overflow(counter, 1, &data)) + if (perf_counter_overflow(counter, 1, &data, regs)) sparc_pmu_disable_counter(hwc, idx); }