From: sbwml <984419930@qq.com>
Date: Wed, 4 Dec 2019 08:39:45 +0000 (+0800)
Subject: Merge Linux 4.4.206-rc1 into 10
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0d954dd843e70365d196a253cbc316811ef654bb;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

Merge Linux 4.4.206-rc1 into 10
---

0d954dd843e70365d196a253cbc316811ef654bb
diff --cc arch/arm64/kernel/smp.c
index 3b8ecc930caa,7e90f429f7e5..34c883225bca
--- a/arch/arm64/kernel/smp.c
+++ b/arch/arm64/kernel/smp.c
@@@ -125,11 -115,9 +125,12 @@@ int __cpu_up(unsigned int cpu, struct t
  		}
  	} else {
  		pr_err("CPU%u: failed to boot: %d\n", cpu, ret);
+ 		return ret;
  	}
  
 +#ifdef CONFIG_THREAD_INFO_IN_TASK
 +	secondary_data.task = NULL;
 +#endif
  	secondary_data.stack = NULL;
  
  	return ret;