On Thu, 20 Nov 2008, Steven Rostedt wrote: > > 1) I removed the changes to recordmcount.pl. This is not a PowerPC > change, although PowerPC needs it for dynamic ftrace. But > the changes here can go via linux-tip.
Ingo, I found that the recordmcount.pl change conflicts with a commit in linux-next, which is not in tip nor mainline. The commit is: 11ebca4a3f8337de2f4d1300bd307851d1191d53 sh: dynamic ftrace support. Seems that this change came in through the sh repo. I have already resolved the conflicts with my updates for PowerPC with this commit. I can put this in a separate branch against linux-next if you like. I would like to get the changes to recordmcount.pl for PowerPC in linux-next soon, so I can also add a small clean up of this code. Jim Radfort has some updates as well for his port to arm. -- Steve _______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@ozlabs.org https://ozlabs.org/mailman/listinfo/linuxppc-dev
