Hi Peter,
On Fri, Jul 08, 2011 at 06:41:16PM +0100, Peter Zijlstra wrote:
> On Fri, 2011-07-08 at 18:34 +0100, Will Deacon wrote:
> > On Fri, Jul 01, 2011 at 04:21:25PM +0100, tip-bot for Peter Zijlstra wrote:
> > > Commit-ID: a8b0ca17b80e92faab46ee7179ba9e99ccb61233
> > > Gitweb: http://git.kernel.org/tip/a8b0ca17b80e92faab46ee7179ba9e99ccb61233
> > > Author: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
> > > AuthorDate: Mon, 27 Jun 2011 14:41:57 +0200
> > > Committer: Ingo Molnar <mingo@xxxxxxx>
> > > CommitDate: Fri, 1 Jul 2011 11:06:35 +0200
> > >
> > > perf: Remove the nmi parameter from the swevent and overflow interface
[...]
> >
> > Whilst you updated the arch code in this series, you forgot to update the
> > oprofile perf backend.
>
> Bah, I bet it skillfully hid from my grep-foo.
>
> > I think you want something as simple as:
> >
> >
> > diff --git a/drivers/oprofile/oprofile_perf.c b/drivers/oprofile/oprofile_perf.c
> > index 59acf9e..94796f3 100644
> > --- a/drivers/oprofile/oprofile_perf.c
> > +++ b/drivers/oprofile/oprofile_perf.c
> > @@ -31,7 +31,7 @@ static int num_counters;
> > /*
> > * Overflow callback for oprofile.
> > */
> > -static void op_overflow_handler(struct perf_event *event, int unused,
> > +static void op_overflow_handler(struct perf_event *event,
> > struct perf_sample_data *data, struct pt_regs *regs)
> > {
> > int id;
> >
>
> Yes, that is sufficient. Thanks!
I can't see this in next. Are you happy taking this or do you want me to
post it to the list as a standalone patch?
Cheers,
Will
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|