diff options
| author | Ingo Molnar | 2009-05-07 11:18:34 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2009-05-07 13:36:22 +0200 |
| commit | 0ad5d703c6c0fcd385d956555460df95dff7eb7e (patch) | |
| tree | 4b777100f9be4fe90ca4bd043b9f98df672b5b3b /arch/x86/kernel/process_32.c | |
| parent | 44347d947f628060b92449702071bfe1d31dfb75 (diff) | |
| parent | 1cb81b143fa8f0e4629f10690862e2e52ca792ff (diff) | |
Merge branch 'tracing/hw-branch-tracing' into tracing/core
Merge reason: this topic is ready for upstream now. It passed
Oleg's review and Andrew had no further mm/*
objections/observations either.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/process_32.c')
| -rw-r--r-- | arch/x86/kernel/process_32.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c index 76f8f84043a2..b5e4bfef4472 100644 --- a/arch/x86/kernel/process_32.c +++ b/arch/x86/kernel/process_32.c @@ -290,7 +290,8 @@ int copy_thread(unsigned long clone_flags, unsigned long sp, p->thread.io_bitmap_max = 0; } - ds_copy_thread(p, current); + clear_tsk_thread_flag(p, TIF_DS_AREA_MSR); + p->thread.ds_ctx = NULL; clear_tsk_thread_flag(p, TIF_DEBUGCTLMSR); p->thread.debugctlmsr = 0; |