Compilation for tracepoint on 2.6.33-rc1

[Wenji Huang]

Hi,

There is compilation error for tracepoint on 2.6.33-rc1, see

$ sudo stap -we 'probe kernel.trace("kvm_mmio"),kernel.trace("sys*"){}'
In file included from 
/tmp/stapOWxU0E/stap_978faaf75db7cd5c5160bd681e7d912e_688.c:271:
include/trace/events/syscalls.h:3:1: error: "TRACE_INCLUDE_FILE" redefined
In file included from 
/tmp/stapOWxU0E/stap_978faaf75db7cd5c5160bd681e7d912e_688.c:151:
include/trace/events/kvm.h:8:1: error: this is the location of the 
previous definition
make[1]: *** 
[/tmp/stapOWxU0E/stap_978faaf75db7cd5c5160bd681e7d912e_688.o] Error 1
make: *** [_module_/tmp/stapOWxU0E] Error 2
Pass 4: compilation failed.  Try again with another '--vp 0001' option.

On 2.6.33-rc1, TRACE_INCLUDE_FILE is defined both 
include/trace/events/syscalls.h and include/trace/events/kvm.h without
leading #undef.

How to handle this, to push a patch of adding #undef before
#define TRACE_INCLUDE_FILE to LKML
or
emit "#undef TRACE_INCLUDE_FILE" before "#include <trace/events/*.h>"
to the generated C code?

Regards,
Wenji