diff --git a/[refs] b/[refs] index e0a9d96ffd2f..8f4d5890d9b2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e162b39a368f0401e41b558f430c354d12a85b37 +refs/heads/master: af432eb1cc3178ec7109aca2283aafb1c12ccac1 diff --git a/trunk/kernel/fork.c b/trunk/kernel/fork.c index 1d68f1255dd8..fb9444282836 100644 --- a/trunk/kernel/fork.c +++ b/trunk/kernel/fork.c @@ -1041,7 +1041,7 @@ static struct task_struct *copy_process(unsigned long clone_flags, p->default_timer_slack_ns = current->timer_slack_ns; -#ifdef CONFIG_DETECT_SOFTLOCKUP +#ifdef CONFIG_DETECT_HUNG_TASK p->last_switch_count = 0; p->last_switch_timestamp = 0; #endif