Re: [PATCH 0/4] ftrace: prevent ftrace modifications while beingkprobe'd

[Ingo Molnar]

* Abhishek Sagar <sagar.abhishek@xxxxxxxxx> wrote:

> Hi Ingo,
> 
> On Tue, Jun 24, 2008 at 1:45 AM, Ingo Molnar <mingo@xxxxxxx> wrote:
> > note that i had to do a number of fixups to themerge, and there was one
> > chunk which did not merge cleanly and i left it out for now:
> >
> > @@ -435,8 +502,12 @@ static void ftrace_replace_code(int enable)
> >                                continue;
> >
> >                        /* ignore updates to this record's mcount site */
> > -                       if (get_kprobe((void *)rec->ip))
> > +                       if (get_kprobe((void *)rec->ip)) {
> > +                               freeze_record(rec);
> >                                continue;
> > +                       } else {
> > +                               unfreeze_record(rec);
> > +                       }
> 
> I wonder why it conflicted during the merge. I notice that patch 4/4 
> has been applied before 3/4. Can you try reversing the order and see 
> if it works? Else I'll redo them.

best would be a delta patch against tip/master to fix up whatever is 
still missing.

	Ingo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/