lkml.org 
[lkml]   [2008]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 0/4] ftrace: prevent ftrace modifications while being kprobe'd
Hi Ingo,

On Tue, Jun 24, 2008 at 1:45 AM, Ingo Molnar <mingo@elte.hu> 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.

--
Thanks,
Abhishek Sagar


\
 
 \ /
  Last update: 2008-06-24 05:31    [W:0.396 / U:0.144 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site