diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-14 18:34:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-14 18:34:32 -0700 |
| commit | c0c50b541a4b147c5c2572ed051420238c47f57a (patch) | |
| tree | 7500aefddead1009ed271c5b413f4b4fa89083a1 /include/trace/events/kmem.h | |
| parent | a376d446771710790f5f3425172b467bf8578e22 (diff) | |
| parent | 6ab5d668b131d3c5416f6df1d3ca95b82d4fe8a2 (diff) | |
| download | op-kernel-dev-c0c50b541a4b147c5c2572ed051420238c47f57a.zip op-kernel-dev-c0c50b541a4b147c5c2572ed051420238c47f57a.tar.gz | |
Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
tracing/function-profiler: do not free per cpu variable stat
tracing/events: Move TRACE_SYSTEM outside of include guard
Diffstat (limited to 'include/trace/events/kmem.h')
| -rw-r--r-- | include/trace/events/kmem.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/trace/events/kmem.h b/include/trace/events/kmem.h index 9baba50..1493c54 100644 --- a/include/trace/events/kmem.h +++ b/include/trace/events/kmem.h @@ -1,12 +1,12 @@ +#undef TRACE_SYSTEM +#define TRACE_SYSTEM kmem + #if !defined(_TRACE_KMEM_H) || defined(TRACE_HEADER_MULTI_READ) #define _TRACE_KMEM_H #include <linux/types.h> #include <linux/tracepoint.h> -#undef TRACE_SYSTEM -#define TRACE_SYSTEM kmem - /* * The order of these masks is important. Matching masks will be seen * first and the left over flags will end up showing by themselves. |
