Re: [tip:perf/urgent] tracing: Include module.h in define_trace.h

[Steven Rostedt <rostedt@goodmis.org>]

On Mon, 2011-01-10 at 15:38 +0100, Peter Zijlstra wrote:
> On Mon, 2011-01-10 at 09:14 -0500, Steven Rostedt wrote:
> > > @@ -21,16 +21,6 @@
> > >  #undef CREATE_TRACE_POINTS
> > 
> > But here we undefine CREATE_TRACE_POINTS, why would this cause a problem
> > in module.h?
> 
> I'm not sure what's happening, all I know is that without this change I
> get:
> 
>   LD      vmlinux.o
> kernel/built-in.o:(__tracepoints+0xac0): multiple definition of `__tracepoint_module_request'
> arch/x86/built-in.o:(__tracepoints+0x100): first defined here
> kernel/built-in.o:(__tracepoints+0xa40): multiple definition of `__tracepoint_module_get'
> arch/x86/built-in.o:(__tracepoints+0x80): first defined here
> kernel/built-in.o:(__tracepoints+0x9c0): multiple definition of `__tracepoint_module_load'
> arch/x86/built-in.o:(__tracepoints+0x0): first defined here
> kernel/built-in.o:(__tracepoints+0xa80): multiple definition of `__tracepoint_module_put'
> arch/x86/built-in.o:(__tracepoints+0xc0): first defined here
> kernel/built-in.o:(__tracepoints+0xa00): multiple definition of `__tracepoint_module_free'
> arch/x86/built-in.o:(__tracepoints+0x40): first defined here

Hmm, OK, I'm able to reproduce it when I add:

#define CREATE_TRACE_POINTS
#include <trace/events/syscalls.h>
#undef CREATE_TRACE_POINTS

as the first thing in ptrace.c. I'll investigate this further.

Thanks!

-- Steve