Re: [PATCH] Compile fix for !CONFIG_HAVE_LTT_DUMP_TABLES

* Jan Altenberg ([email protected]) wrote:
> Mathieu,
> 
> 2.6.24-rc4-lttng-0.10-pre38 doesn't compile for platforms, where 
> CONFIG_HAVE_LTT_DUMP_TABLES isn't set:
> 
> [...]
> ltt/ltt-relay.o: In function `ltt_dump_sys_call_table':
> ltt-relay.c:(.text+0x0): multiple definition of `ltt_dump_sys_call_table'
> ltt/ltt-tracer.o:ltt-tracer.c:(.text+0x0): first defined here
> ltt/ltt-relay.o: In function `ltt_dump_idt_table':
> ltt-relay.c:(.text+0x4): multiple definition of `ltt_dump_idt_table'
> ltt/ltt-tracer.o:ltt-tracer.c:(.text+0x4): first defined here
> ltt/ltt-control.o: In function `ltt_dump_sys_call_table':
> ltt-control.c:(.text+0x0): multiple definition of `ltt_dump_sys_call_table'
> ltt/ltt-tracer.o:ltt-tracer.c:(.text+0x0): first defined here
> [...]
> 
Ok, fixed in pre39. Thanks!

> See attached patch.
> 
> Cheers,
> 	Jan
> 
> Signed-off-by: Jan Altenberg <[email protected]>
> 
> ---
>  include/linux/ltt-tracer.h |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> Index: linux-2.6.24-rc4/include/linux/ltt-tracer.h
> ===================================================================
> --- linux-2.6.24-rc4.orig/include/linux/ltt-tracer.h
> +++ linux-2.6.24-rc4/include/linux/ltt-tracer.h
> @@ -822,11 +822,11 @@ extern void ltt_dump_softirq_vec(void *c
>  extern void ltt_dump_sys_call_table(void *call_data);
>  extern void ltt_dump_idt_table(void *call_data);
>  #else
> -void ltt_dump_sys_call_table(void *call_data)
> +static inline void ltt_dump_sys_call_table(void *call_data)
>  {
>  }
>  
> -void ltt_dump_idt_table(void *call_data)
> +static inline void ltt_dump_idt_table(void *call_data)
>  {
>  }
>  #endif
> 
> 

-- 
Mathieu Desnoyers
Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F  BA06 3F25 A8FE 3BAE 9A68