]> err.no Git - linux-2.6/commitdiff
[Blackfin] arch: Fix BUG - Enable ISP1362 driver to work ok with BF561
authorMichael Hennerich <michael.hennerich@analog.com>
Sat, 2 Feb 2008 07:10:51 +0000 (15:10 +0800)
committerBryan Wu <bryan.wu@analog.com>
Sat, 2 Feb 2008 07:10:51 +0000 (15:10 +0800)
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>
arch/blackfin/kernel/setup.c

index 2f156bfc2b2ce6c330b72844264db90e360c6306..aca5e6e5bbdd808cbe83745eb98843afdb4ae45d 100644 (file)
@@ -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);