Hi Mathieu, Tried to apply the patch.
Seems to be working with: *ltt/ltt-relay-lockless.c* *ltt/ltt-relay-lockless.h* But failed for: *ltt/Kconfig* *ltt/ltt-relay-alloc.c* Here is the output: http://pastebin.com/52hgyz6D Regards, Romik On Mon, Apr 12, 2010 at 3:13 AM, Mathieu Desnoyers < [email protected]> wrote: > * Romik Guha Anjoy ([email protected]) wrote: > > Hi, > > > > I tried to install lttng 0.203 along with kernel 2.6.33.1 and ended up > with > > the following error while compilation: > > http://pastebin.com/iNBbjZ3A > > > > Below is my config file: > > http://pastebin.com/Ta68rMCR > > > > Thanks for the bug report. The following patch should help. Feedback is > welcome. > > Mathieu > > > LTTng fix module deps > > relay module dependencies and symbol declaration problems crept in lately. > > Signed-off-by: Mathieu Desnoyers <[email protected]> > --- > ltt/Kconfig | 11 ++++++----- > ltt/ltt-relay-alloc.c | 11 +++++++++-- > ltt/ltt-relay-lockless.c | 7 ++----- > ltt/ltt-relay-lockless.h | 3 +++ > 4 files changed, 20 insertions(+), 12 deletions(-) > > Index: linux-2.6-lttng/ltt/Kconfig > =================================================================== > --- linux-2.6-lttng.orig/ltt/Kconfig 2010-04-11 21:00:09.000000000 -0400 > +++ linux-2.6-lttng/ltt/Kconfig 2010-04-11 21:01:59.000000000 -0400 > @@ -35,11 +35,15 @@ config HAVE_LTT_DUMP_TABLES > def_bool n > > config LTT_RELAY > - def_bool n > + tristate "LTTng buffer relay" > + depends on LTT_TRACER > + default y > + help > + Build the LTTng ring-buffer. > > choice > prompt "LTTng Buffer Concurrency Management Algorithm" > - depends on LTT_TRACER > + depends on LTT_RELAY > default LTT_RELAY_LOCKLESS > help > Choose between the fast lockless and the slower, spinlock/irq > disable > @@ -47,7 +51,6 @@ choice > > config LTT_RELAY_LOCKLESS > bool "Linux Trace Toolkit High-speed Lockless Data Relay" > - select LTT_RELAY > select DEBUG_FS > help > Support using the fast lockless algorithm to log the data obtained > @@ -58,7 +61,6 @@ choice > > config LTT_RELAY_IRQOFF > bool "Linux Trace Toolkit Irq-off Data Relay" > - select LTT_RELAY > select DEBUG_FS > depends on BROKEN > help > @@ -67,7 +69,6 @@ choice > > config LTT_RELAY_LOCKED > bool "Linux Trace Toolkit Lock-Protected Data Relay" > - select LTT_RELAY > select DEBUG_FS > depends on BROKEN > help > Index: linux-2.6-lttng/ltt/ltt-relay-alloc.c > =================================================================== > --- linux-2.6-lttng.orig/ltt/ltt-relay-alloc.c 2010-04-11 > 21:06:47.000000000 -0400 > +++ linux-2.6-lttng/ltt/ltt-relay-alloc.c 2010-04-11 > 21:08:21.000000000 -0400 > @@ -594,10 +594,17 @@ void *ltt_relay_offset_address(struct lt > } > EXPORT_SYMBOL_GPL(ltt_relay_offset_address); > > -static __init int ltt_relay_init(void) > +static __init int ltt_relay_alloc_init(void) > { > hotcpu_notifier(ltt_relay_hotcpu_callback, 5); > + ltt_relay_init(); > return 0; > } > > -module_init(ltt_relay_init); > +static void __exit ltt_relay_alloc_exit(void) > +{ > + ltt_relay_exit(); > +} > + > +module_init(ltt_relay_alloc_init); > +module_exit(ltt_relay_alloc_exit); > Index: linux-2.6-lttng/ltt/ltt-relay-lockless.c > =================================================================== > --- linux-2.6-lttng.orig/ltt/ltt-relay-lockless.c 2010-04-11 > 21:06:55.000000000 -0400 > +++ linux-2.6-lttng/ltt/ltt-relay-lockless.c 2010-04-11 > 21:09:02.000000000 -0400 > @@ -1337,7 +1337,7 @@ static struct notifier_block fn_ltt_chan > .priority = 6, > }; > > -static int __init ltt_relay_init(void) > +int __init ltt_relay_init(void) > { > printk(KERN_INFO "LTT : ltt-relay init\n"); > > @@ -1348,7 +1348,7 @@ static int __init ltt_relay_init(void) > return 0; > } > > -static void __exit ltt_relay_exit(void) > +void __exit ltt_relay_exit(void) > { > printk(KERN_INFO "LTT : ltt-relay exit\n"); > > @@ -1357,9 +1357,6 @@ static void __exit ltt_relay_exit(void) > ltt_transport_unregister(<t_relay_transport); > } > > -module_init(ltt_relay_init); > -module_exit(ltt_relay_exit); > - > MODULE_LICENSE("GPL and additional rights"); > MODULE_AUTHOR("Mathieu Desnoyers"); > MODULE_DESCRIPTION("Linux Trace Toolkit Next Generation Lockless Relay"); > Index: linux-2.6-lttng/ltt/ltt-relay-lockless.h > =================================================================== > --- linux-2.6-lttng.orig/ltt/ltt-relay-lockless.h 2010-04-11 > 21:09:49.000000000 -0400 > +++ linux-2.6-lttng/ltt/ltt-relay-lockless.h 2010-04-11 > 21:10:23.000000000 -0400 > @@ -184,6 +184,9 @@ extern int ltt_chanbuf_put_subbuf(struct > extern void ltt_chan_start_switch_timer(struct ltt_chan *chan); > extern void ltt_chan_stop_switch_timer(struct ltt_chan *chan); > > +extern int ltt_relay_init(void); > +extern void ltt_relay_exit(void); > + > static __inline__ > unsigned long ltt_chanbuf_get_offset(struct ltt_chanbuf *buf) > { > > > > > > > > Warm Regards, > > > > *Romik Guha Anjoy* > > Mälardalens Högskola > > Västerås, Sweden > > Cell: +46 704478803 > > mailto: [email protected] > > > _______________________________________________ > > ltt-dev mailing list > > [email protected] > > http://lists.casi.polymtl.ca/cgi-bin/mailman/listinfo/ltt-dev > > > -- > Mathieu Desnoyers > Operating System Efficiency R&D Consultant > EfficiOS Inc. > http://www.efficios.com >
_______________________________________________ ltt-dev mailing list [email protected] http://lists.casi.polymtl.ca/cgi-bin/mailman/listinfo/ltt-dev
