From: Michael Hennerich <michael.hennerich@analog.com>
Date: Sat, 2 Feb 2008 07:10:51 +0000 (+0800)
Subject: [Blackfin] arch: Fix BUG - Enable ISP1362 driver to work ok with BF561
X-Git-Tag: v2.6.25-rc1~33^2~15
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6cda2e90588ba2f70543abf68b4815e10c86aef1;p=linux-2.6

[Blackfin] arch: Fix BUG - Enable ISP1362 driver to work ok with BF561

This fixes a bug (zero pointer access) only seen on BF561, during USB
Mass Storage/SCSI Host initialization.

It appears to be related to registering a none existing CPU

Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Bryan Wu <bryan.wu@analog.com>
---

diff --git a/arch/blackfin/kernel/setup.c b/arch/blackfin/kernel/setup.c
index 2f156bfc2b..aca5e6e5bb 100644
--- a/arch/blackfin/kernel/setup.c
+++ b/arch/blackfin/kernel/setup.c
@@ -48,6 +48,8 @@
 #include <asm/fixed_code.h>
 #include <asm/early_printk.h>
 
+static DEFINE_PER_CPU(struct cpu, cpu_devices);
+
 u16 _bfin_swrst;
 
 unsigned long memory_start, memory_end, physical_mem_end;
@@ -763,15 +765,15 @@ void __init setup_arch(char **cmdline_p)
 
 static int __init topology_init(void)
 {
-#if defined (CONFIG_BF561)
-	static struct cpu cpu[2];
-	register_cpu(&cpu[0], 0);
-	register_cpu(&cpu[1], 1);
+	int cpu;
+
+	for_each_possible_cpu(cpu) {
+		struct cpu *c = &per_cpu(cpu_devices, cpu);
+
+		register_cpu(c, cpu);
+	}
+
 	return 0;
-#else
-	static struct cpu cpu[1];
-	return register_cpu(cpu, 0);
-#endif
 }
 
 subsys_initcall(topology_init);