diff options
author | Colin Cross <ccross@android.com> | 2011-01-07 17:20:53 -0800 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2011-01-07 17:20:53 -0800 |
commit | 351516118103c6c7bb5321aa9d5866eb3dc0d5ca (patch) | |
tree | bf8ecc55d77847ec8299bcf964352bef38121cc5 /kernel/fork.c | |
parent | c37bff78783d40d6e604129135c207e279de902f (diff) | |
parent | bd842b53fada517017d192c8a12fc9a38e6250e1 (diff) |
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
Conflicts:
arch/arm/mm/cache-v6.S
Change-Id: I1a2063218dd705a762a40f4a9dfe504ce1a1d491
Diffstat (limited to 'kernel/fork.c')
-rw-r--r-- | kernel/fork.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index f3d93ab730c6..b1962c287d3f 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -288,6 +288,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig) setup_thread_stack(tsk, orig); clear_user_return_notifier(tsk); + clear_tsk_need_resched(tsk); stackend = end_of_stack(tsk); *stackend = STACK_END_MAGIC; /* for overflow detection */ |