diff options
Diffstat (limited to 'kernel/fork.c')
| -rw-r--r-- | kernel/fork.c | 7 | 
1 files changed, 1 insertions, 6 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index f68954d05e89..c0257cbee093 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -755,11 +755,6 @@ static void check_mm(struct mm_struct *mm)  	for (i = 0; i < NR_MM_COUNTERS; i++) {  		long x = percpu_counter_sum(&mm->rss_stat[i]); -		if (likely(!x)) -			continue; - -		/* Making sure this is not due to race with CPU offlining. */ -		x = percpu_counter_sum_all(&mm->rss_stat[i]);  		if (unlikely(x))  			pr_alert("BUG: Bad rss-counter state mm:%p type:%s val:%ld\n",  				 mm, resident_page_types[i], x); @@ -2936,7 +2931,7 @@ static bool clone3_args_valid(struct kernel_clone_args *kargs)  	 * - make the CLONE_DETACHED bit reusable for clone3  	 * - make the CSIGNAL bits reusable for clone3  	 */ -	if (kargs->flags & (CLONE_DETACHED | CSIGNAL)) +	if (kargs->flags & (CLONE_DETACHED | (CSIGNAL & (~CLONE_NEWTIME))))  		return false;  	if ((kargs->flags & (CLONE_SIGHAND | CLONE_CLEAR_SIGHAND)) ==  |