From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756756AbZLNKy4 (ORCPT ); Mon, 14 Dec 2009 05:54:56 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756704AbZLNKyy (ORCPT ); Mon, 14 Dec 2009 05:54:54 -0500 Received: from mx2.mail.elte.hu ([157.181.151.9]:46517 "EHLO mx2.mail.elte.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756692AbZLNKyy (ORCPT ); Mon, 14 Dec 2009 05:54:54 -0500 Date: Mon, 14 Dec 2009 11:54:35 +0100 From: Ingo Molnar To: Stephen Rothwell Cc: mingo@redhat.com, hpa@zytor.com, linux-kernel@vger.kernel.org, fweisbec@gmail.com, heiko.carstens@de.ibm.com, tglx@linutronix.de, linux-tip-commits@vger.kernel.org Subject: Re: [tip:perf/urgent] hw-breakpoints: Let modify_user_hw_breakpoint() return an int Message-ID: <20091214105435.GA15766@elte.hu> References: <20091214092412.GA5242@osiris.boeblingen.de.ibm.com> <20091214213817.dea4fe86.sfr@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20091214213817.dea4fe86.sfr@canb.auug.org.au> User-Agent: Mutt/1.5.20 (2009-08-17) X-ELTE-SpamScore: 0.0 X-ELTE-SpamLevel: X-ELTE-SpamCheck: no X-ELTE-SpamVersion: ELTE 2.0 X-ELTE-SpamCheck-Details: score=0.0 required=5.9 tests=none autolearn=no SpamAssassin version=3.2.5 _SUMMARY_ Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org * Stephen Rothwell wrote: > Hi Ingo, > > On Mon, 14 Dec 2009 09:49:44 GMT tip-bot for Heiko Carstens wrote: > > > > Commit-ID: 4983ee49cf0393fd786891dd53af41146cf9f98b > > Gitweb: http://git.kernel.org/tip/4983ee49cf0393fd786891dd53af41146cf9f98b > > Author: Heiko Carstens > > AuthorDate: Mon, 14 Dec 2009 10:24:12 +0100 > > Committer: Ingo Molnar > > CommitDate: Mon, 14 Dec 2009 10:42:57 +0100 > > > > hw-breakpoints: Let modify_user_hw_breakpoint() return an int > > > > Let modify_user_hw_breakpoint return an int to avoid hundreds of > > compile warnings like this one: > > > > include/linux/hw_breakpoint.h: In function 'modify_user_hw_breakpoint': > > include/linux/hw_breakpoint.h:96: > > warning: return makes integer from pointer without a cast > > > > Signed-off-by: Heiko Carstens > > Cc: Frederic Weisbecker > > LKML-Reference: <20091214092412.GA5242@osiris.boeblingen.de.ibm.com> > > Signed-off-by: Ingo Molnar > > --- > > include/linux/hw_breakpoint.h | 2 +- > > 1 files changed, 1 insertions(+), 1 deletions(-) > > > > diff --git a/include/linux/hw_breakpoint.h b/include/linux/hw_breakpoint.h > > index 41235c9..3f3ac2f 100644 > > --- a/include/linux/hw_breakpoint.h > > +++ b/include/linux/hw_breakpoint.h > > @@ -90,7 +90,7 @@ static inline struct arch_hw_breakpoint *counter_arch_bp(struct perf_event *bp) > > static inline struct perf_event * > > register_user_hw_breakpoint(struct perf_event_attr *attr, > > perf_overflow_handler_t triggered, > > - struct task_struct *tsk) { return NULL; } > > + struct task_struct *tsk) { return 0; } > > static inline int > > modify_user_hw_breakpoint(struct perf_event *bp, > > struct perf_event_attr *attr) { return -ENOSYS; } > > This applied incorrectly ... it was a fix for modify_user_hw_breakpoint(), > but that fix has already bee applied to perf/urgent ... yeah ... zapped it. Ingo