Port from 2.6.21-rc6-mm1 to 2.6.21
Mathieu Desnoyers <[email protected]>
| Newsgroups | gmane.linux.kernel.tracing |
|---|---|
| Message-ID | <20070427041817.GA28658@Krystal> |
Hi Deepak, Actually, linux/kdebug.h is specific to Andrew's tree and has not been merged into Linus's tree. Since you seem to be already doing the port from 2.6.21-rc6-mm1 to 2.6.21, can you send me your patches once they are ready ? I would be glad to publish them. Currently, it is mostly my marker work, include/*/local.h, include/*/atomic.h, include/*/system.h and my marker patches which must be copied from a -mm kernel into the mainline kernel, since they are in Andrew's tree but not in the mainline. The rest of the LTTng patches should not suffer from too much conflicts between mainline and -mm. The best approach is probably to apply the patches in the following order : Get a 2.6.21 tree Get the set of patches from Andrew, select the atomic ops, local atomic ops and markers patches from the series file. Get the latest LTTng for -mm tree. Regards, Mathieu * Deepak Saxena ([email protected]) wrote: > > linux/kdebug.h no longer exists. > > Signed-off-by: Deepak Saxena <[email protected]> > > > Index: linux-2.6.21/arch/i386/kernel/marker.c > =================================================================== > --- linux-2.6.21.orig/arch/i386/kernel/marker.c > +++ linux-2.6.21/arch/i386/kernel/marker.c > @@ -18,9 +18,9 @@ > #include <linux/notifier.h> > #include <linux/module.h> > #include <linux/marker.h> > -#include <linux/kdebug.h> > > #include <asm/cacheflush.h> > +#include <asm/kdebug.h> > > #define BREAKPOINT_INSTRUCTION 0xcc > #define BREAKPOINT_INS_LEN 1 > > -- > Deepak Saxena - [email protected] - http://www.plexity.net > > In the end, they will not say, "those were dark times," they will ask > "why were their poets silent?" - Bertolt Brecht > _______________________________________________ > Ltt-dev mailing list > [email protected] > http://listserv.shafik.org/mailman/listinfo/ltt-dev > -- Mathieu Desnoyers Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68