summaryrefslogtreecommitdiffstats
path: root/arch/i386/kernel/process.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-11-25 22:12:01 +1100
committerPaul Mackerras <paulus@samba.org>2005-11-25 22:12:01 +1100
commit26925c5910ab77fc95b4d8bb6d98780b50ab1e5a (patch)
tree7d7506b3aedeea4db8b8659f046850db97503a89 /arch/i386/kernel/process.c
parent55bb239e5464ecde046af3e45052ef06efda6444 (diff)
parentcd0cca7bf5e201dcea5632f78ad9b37cb419a5df (diff)
Merge ../linux-2.6
Diffstat (limited to 'arch/i386/kernel/process.c')
-rw-r--r--arch/i386/kernel/process.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/i386/kernel/process.c b/arch/i386/kernel/process.c
index 1cb261f225d..df6c2bcde06 100644
--- a/arch/i386/kernel/process.c
+++ b/arch/i386/kernel/process.c
@@ -393,13 +393,6 @@ void flush_thread(void)
{
struct task_struct *tsk = current;
- /*
- * Remove function-return probe instances associated with this task
- * and put them back on the free list. Do not insert an exit probe for
- * this function, it will be disabled by kprobe_flush_task if you do.
- */
- kprobe_flush_task(tsk);
-
memset(tsk->thread.debugreg, 0, sizeof(unsigned long)*8);
memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array));
/*