Re: [tip:perf/urgent] hw-breakpoints: Let modify_user_hw_breakpoint() return an int

[Ingo Molnar <mingo@elte.hu>]

* Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Ingo,
> 
> On Mon, 14 Dec 2009 09:49:44 GMT tip-bot for Heiko Carstens <heiko.carstens@de.ibm.com> wrote:
> >
> > Commit-ID:  4983ee49cf0393fd786891dd53af41146cf9f98b
> > Gitweb:     http://git.kernel.org/tip/4983ee49cf0393fd786891dd53af41146cf9f98b
> > Author:     Heiko Carstens <heiko.carstens@de.ibm.com>
> > AuthorDate: Mon, 14 Dec 2009 10:24:12 +0100
> > Committer:  Ingo Molnar <mingo@elte.hu>
> > 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 <heiko.carstens@de.ibm.com>
> > Cc: Frederic Weisbecker <fweisbec@gmail.com>
> > LKML-Reference: <20091214092412.GA5242@osiris.boeblingen.de.ibm.com>
> > Signed-off-by: Ingo Molnar <mingo@elte.hu>
> > ---
> >  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