From: Mark Brown <broonie@linaro.org>
Date: Tue, 20 May 2014 00:02:32 +0000 (+0100)
Subject: Merge remote-tracking branch 'lsk/v3.10/topic/arm64-misc' into linux-linaro-lsk
X-Git-Tag: firefly_0821_release~3680^2~125^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=57b66b618b5d942b36480e03c2d656d21d04cb1b;p=firefly-linux-kernel-4.4.55.git

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

57b66b618b5d942b36480e03c2d656d21d04cb1b
diff --cc arch/arm64/kernel/setup.c
index 05757983626d,bb99e3a5ac56..bb9e709879c3
--- a/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
@@@ -196,13 -116,7 +196,8 @@@ static void __init smp_build_mpidr_hash
  static void __init setup_processor(void)
  {
  	struct cpu_info *cpu_info;
 +	u64 features, block;
  
- 	/*
- 	 * locate processor in the list of supported processor
- 	 * types.  The linker builds this table for us from the
- 	 * entries in arch/arm/mm/proc.S
- 	 */
  	cpu_info = lookup_processor_type(read_cpuid_id());
  	if (!cpu_info) {
  		printk("CPU configuration botched (ID %08x), unable to continue.\n",