Merge branch 'linus' into perfcounters/core

[linux-beck.git] / kernel / exit.c

diff --git a/kernel/exit.c b/kernel/exit.c
index 99ad4063ee4a04ce4c97f5695fef47341775c7af..49cdf6946f34b4b64b4e61f18dcd417b16f7faa6 100644 (file)
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -49,7 +49,7 @@
 #include <linux/fs_struct.h>
 #include <linux/init_task.h>
 #include <linux/perf_counter.h>
-#include <trace/sched.h>
+#include <trace/events/sched.h>
 
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
@@ -57,10 +57,6 @@
 #include <asm/mmu_context.h>
 #include "cred-internals.h"
 
-DEFINE_TRACE(sched_process_free);
-DEFINE_TRACE(sched_process_exit);
-DEFINE_TRACE(sched_process_wait);
-
 static void exit_mm(struct task_struct * tsk);
 
 static void __unhash_process(struct task_struct *p)