From: Mark Brown <broonie@linaro.org>
Date: Wed, 11 Dec 2013 22:37:23 +0000 (+0000)
Subject: Merge remote-tracking branch 'lsk/v3.10/topic/arm64-cpu' into linux-linaro-lsk
X-Git-Tag: firefly_0821_release~3680^2~158^2~29
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c3a3fb845b3d12229184b81a7f773c7f81d27009;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branch 'lsk/v3.10/topic/arm64-cpu' into linux-linaro-lsk
---

c3a3fb845b3d12229184b81a7f773c7f81d27009
diff --cc arch/arm64/kernel/smp.c
index 8d8a1f2af29a,e0b7c0e45b87..5e9d27442fbb
--- a/arch/arm64/kernel/smp.c
+++ b/arch/arm64/kernel/smp.c
@@@ -393,14 -387,9 +397,14 @@@ next
  
  void __init smp_prepare_cpus(unsigned int max_cpus)
  {
- 	int cpu, err;
- 	unsigned int ncores = num_possible_cpus();
+ 	int err;
+ 	unsigned int cpu, ncores = num_possible_cpus();
  
 +	init_cpu_topology();
 +
 +	smp_store_cpu_info(smp_processor_id());
 +
 +
  	/*
  	 * are we trying to boot more cores than exist?
  	 */