diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-22 17:22:48 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-22 17:22:48 +0100 |
| commit | 8ba8ed54de4dd79bb88ab6cd7dbf2e83d58d6d57 (patch) | |
| tree | d4d1c687f1b7f58783103b43a04618d8e4019bba /kernel | |
| parent | Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | writeback: remove vm_dirties and task->dirties (diff) | |
| download | linux-8ba8ed54de4dd79bb88ab6cd7dbf2e83d58d6d57.tar.xz linux-8ba8ed54de4dd79bb88ab6cd7dbf2e83d58d6d57.zip | |
Merge branch 'writeback-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux
* 'writeback-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux:
writeback: remove vm_dirties and task->dirties
writeback: hard throttle 1000+ dd on a slow USB stick
mm: Make task in balance_dirty_pages() killable
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/fork.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index ba0d17261329..da4a6a10d088 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -162,7 +162,6 @@ static void account_kernel_stack(struct thread_info *ti, int account) void free_task(struct task_struct *tsk) { - prop_local_destroy_single(&tsk->dirties); account_kernel_stack(tsk->stack, -1); free_thread_info(tsk->stack); rt_mutex_debug_task_free(tsk); @@ -274,10 +273,6 @@ static struct task_struct *dup_task_struct(struct task_struct *orig) tsk->stack = ti; - err = prop_local_init_single(&tsk->dirties); - if (err) - goto out; - setup_thread_stack(tsk, orig); clear_user_return_notifier(tsk); clear_tsk_need_resched(tsk); |