From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Tue, 5 Aug 2014 04:13:41 +0000 (+1000)
Subject: Merge remote-tracking branch 'scott/next' into next
X-Git-Tag: v3.17-rc1~91^2~39
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=9287b95ec9ded0a4458094ebd967502263d80112;p=linux.git

Merge remote-tracking branch 'scott/next' into next

Scott writes:

Highlights include e6500 hardware threading support, an e6500 TLB erratum
workaround, corenet error reporting, support for a new board, and some
minor fixes.
---

9287b95ec9ded0a4458094ebd967502263d80112
diff --cc arch/powerpc/kernel/setup-common.c
index e5b022c55ccd,1bb4dcde0dcc..1b0e26013a62
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@@ -468,18 -468,12 +468,20 @@@ void __init smp_setup_cpu_maps(void
  			}
  		}
  
+ 		nthreads = len / sizeof(int);
+ 
  		for (j = 0; j < nthreads && cpu < nr_cpu_ids; j++) {
 +			bool avail;
 +
  			DBG("    thread %d -> cpu %d (hard id %d)\n",
  			    j, cpu, be32_to_cpu(intserv[j]));
 -			set_cpu_present(cpu, of_device_is_available(dn));
 +
 +			avail = of_device_is_available(dn);
 +			if (!avail)
 +				avail = !of_property_match_string(dn,
 +						"enable-method", "spin-table");
 +
 +			set_cpu_present(cpu, avail);
  			set_hard_smp_processor_id(cpu, be32_to_cpu(intserv[j]));
  			set_cpu_possible(cpu, true);
  			cpu++;