diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-05-07 11:18:34 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-05-07 13:36:22 +0200 |
| commit | 0ad5d703c6c0fcd385d956555460df95dff7eb7e (patch) | |
| tree | 4b777100f9be4fe90ca4bd043b9f98df672b5b3b /kernel/fork.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 'kernel/fork.c')
| -rw-r--r-- | kernel/fork.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index 085f73ebcea..711468f3db2 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -1088,8 +1088,8 @@ static struct task_struct *copy_process(unsigned long clone_flags, #ifdef CONFIG_DEBUG_MUTEXES p->blocked_on = NULL; /* not blocked yet */ #endif - if (unlikely(current->ptrace)) - ptrace_fork(p, clone_flags); + + p->bts = NULL; /* Perform scheduler related setup. Assign this task to a CPU. */ sched_fork(p, clone_flags); |