diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-07 17:11:07 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-07 17:11:07 -0400 |
commit | 1551260d1f0fb1d23f264582092b862fce5e2dbd (patch) | |
tree | d06a0d20c74adda44a78bc2dc9a3e3016de380d6 /kernel/fork.c | |
parent | c93f216b5b985a12a18323e5ca2eb01db3d2f000 (diff) | |
parent | 5e34437840d33554f69380584311743b39e8fbeb (diff) |
Merge branch 'core/softlockup' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core/softlockup' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
softlockup: make DETECT_HUNG_TASK default depend on DETECT_SOFTLOCKUP
softlockup: move 'one' to the softlockup section in sysctl.c
softlockup: ensure the task has been switched out once
softlockup: remove timestamp checking from hung_task
softlockup: convert read_lock in hung_task to rcu_read_lock
softlockup: check all tasks in hung_task
softlockup: remove unused definition for spawn_softlockup_task
softlockup: fix potential race in hung_task when resetting timeout
softlockup: fix to allow compiling with !DETECT_HUNG_TASK
softlockup: decouple hung tasks check from softlockup detection
Diffstat (limited to 'kernel/fork.c')
-rw-r--r-- | kernel/fork.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index 660c2b8765bc..989c7c202b3d 100644 --- a/kernel/fork.c +++ b/kernel/fork.c | |||
@@ -645,6 +645,9 @@ static int copy_mm(unsigned long clone_flags, struct task_struct * tsk) | |||
645 | 645 | ||
646 | tsk->min_flt = tsk->maj_flt = 0; | 646 | tsk->min_flt = tsk->maj_flt = 0; |
647 | tsk->nvcsw = tsk->nivcsw = 0; | 647 | tsk->nvcsw = tsk->nivcsw = 0; |
648 | #ifdef CONFIG_DETECT_HUNG_TASK | ||
649 | tsk->last_switch_count = tsk->nvcsw + tsk->nivcsw; | ||
650 | #endif | ||
648 | 651 | ||
649 | tsk->mm = NULL; | 652 | tsk->mm = NULL; |
650 | tsk->active_mm = NULL; | 653 | tsk->active_mm = NULL; |
@@ -1032,11 +1035,6 @@ static struct task_struct *copy_process(unsigned long clone_flags, | |||
1032 | 1035 | ||
1033 | p->default_timer_slack_ns = current->timer_slack_ns; | 1036 | p->default_timer_slack_ns = current->timer_slack_ns; |
1034 | 1037 | ||
1035 | #ifdef CONFIG_DETECT_SOFTLOCKUP | ||
1036 | p->last_switch_count = 0; | ||
1037 | p->last_switch_timestamp = 0; | ||
1038 | #endif | ||
1039 | |||
1040 | task_io_accounting_init(&p->ioac); | 1038 | task_io_accounting_init(&p->ioac); |
1041 | acct_clear_integrals(p); | 1039 | acct_clear_integrals(p); |
1042 | 1040 | ||