diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-06-11 08:01:14 +0200 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-06-11 08:01:14 +0200 |
commit | cf9fe114e3b37e14fc8434d5abb192e35df551b1 (patch) | |
tree | 0f82879295dc792f9df1a3ce79e143a3c073510f /kernel/exit.c | |
parent | sh: plug vsyscall dir in to archclean. (diff) | |
parent | Merge branch 'tracing-urgent-for-linus' of git://git.kernel.org/pub/scm/linux... (diff) | |
download | linux-cf9fe114e3b37e14fc8434d5abb192e35df551b1.tar.xz linux-cf9fe114e3b37e14fc8434d5abb192e35df551b1.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'kernel/exit.c')
-rw-r--r-- | kernel/exit.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/kernel/exit.c b/kernel/exit.c index abf9cf3b95c6..cab535c427b8 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -48,7 +48,7 @@ #include <linux/tracehook.h> #include <linux/fs_struct.h> #include <linux/init_task.h> -#include <trace/sched.h> +#include <trace/events/sched.h> #include <asm/uaccess.h> #include <asm/unistd.h> @@ -56,10 +56,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) |