diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-08-05 06:13:41 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-08-05 06:13:41 +0200 |
| commit | 9287b95ec9ded0a4458094ebd967502263d80112 (patch) | |
| tree | b288d670f96376b410fa1980b9413a2360bf4431 /arch/powerpc/kernel/prom.c | |
| parent | Add Michael Ellerman as powerpc co-maintainer (diff) | |
| parent | powerpc/t2080rdb: Add T2080RDB board support (diff) | |
| download | linux-9287b95ec9ded0a4458094ebd967502263d80112.tar.xz linux-9287b95ec9ded0a4458094ebd967502263d80112.zip | |
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.
Diffstat (limited to 'arch/powerpc/kernel/prom.c')
| -rw-r--r-- | arch/powerpc/kernel/prom.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c index 1914791dd329..1a3b1055f5eb 100644 --- a/arch/powerpc/kernel/prom.c +++ b/arch/powerpc/kernel/prom.c @@ -308,12 +308,10 @@ static int __init early_init_dt_scan_cpus(unsigned long node, /* Get physical cpuid */ intserv = of_get_flat_dt_prop(node, "ibm,ppc-interrupt-server#s", &len); - if (intserv) { - nthreads = len / sizeof(int); - } else { - intserv = of_get_flat_dt_prop(node, "reg", NULL); - nthreads = 1; - } + if (!intserv) + intserv = of_get_flat_dt_prop(node, "reg", &len); + + nthreads = len / sizeof(int); /* * Now see if any of these threads match our boot cpu. |