diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-06-11 17:55:42 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-06-11 17:55:42 +0200 |
| commit | 940010c5a314a7bd9b498593bc6ba1718ac5aec5 (patch) | |
| tree | d141e08ced08c40c6a8e3ab2cdecde5ff14e560f /kernel/trace/events.c | |
| parent | 8dc8e5e8bc0ce00b0f656bf972f67cd8a72759e5 (diff) | |
| parent | 991ec02cdca33b03a132a0cacfe6f0aa0be9aa8d (diff) | |
Merge branch 'linus' into perfcounters/core
Conflicts:
arch/x86/kernel/irqinit.c
arch/x86/kernel/irqinit_64.c
arch/x86/kernel/traps.c
arch/x86/mm/fault.c
include/linux/sched.h
kernel/exit.c
Diffstat (limited to 'kernel/trace/events.c')
| -rw-r--r-- | kernel/trace/events.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/kernel/trace/events.c b/kernel/trace/events.c deleted file mode 100644 index 246f2aa6dc4..00000000000 --- a/kernel/trace/events.c +++ /dev/null @@ -1,14 +0,0 @@ -/* - * This is the place to register all trace points as events. - */ - -#include <linux/stringify.h> - -#include <trace/trace_events.h> - -#include "trace_output.h" - -#include "trace_events_stage_1.h" -#include "trace_events_stage_2.h" -#include "trace_events_stage_3.h" - |