diff options
| author | Dave Jones <davej@redhat.com> | 2005-11-29 12:48:34 -0800 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2005-11-29 12:48:34 -0800 |
| commit | be37bdbce7ceaacf4f20c6cc759efbe75ebd1196 (patch) | |
| tree | f1a42fb5a4a17eea41d47d2c002fa303009f5523 /arch/i386/kernel | |
| parent | 019a61b99338d0ac05de25317b85da88e7ec4b35 (diff) | |
| parent | d70aa5e4b54aa7e704c886838715ac8a45d5750f (diff) | |
Merge ../linus
Diffstat (limited to 'arch/i386/kernel')
| -rw-r--r-- | arch/i386/kernel/process.c | 7 |
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)); /* |