patch-2.1.9 linux/arch/sparc/kernel/devices.c

Next file: linux/arch/sparc/kernel/entry.S
Previous file: linux/arch/sparc/kernel/cpu.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.8/linux/arch/sparc/kernel/devices.c linux/arch/sparc/kernel/devices.c
@@ -18,6 +18,7 @@
 
 extern void cpu_probe(void);
 extern void clock_stop_probe(void); /* tadpole.c */
+extern void sun4c_probe_memerr_reg(void);
 
 unsigned long
 device_scan(unsigned long mem_start)
@@ -30,7 +31,7 @@
 #if CONFIG_AP1000
         printk("Not scanning device list for CPUs\n");
 	linux_num_cpus = 1;
-	return;
+	return mem_start;
 #endif
 
 	prom_getstring(prom_root_node, "device_type", node_str, sizeof(node_str));
@@ -75,6 +76,9 @@
 	}
 #endif
 	clock_stop_probe();
+
+	if (sparc_cpu_model == sun4c)
+		sun4c_probe_memerr_reg();
 
 	return mem_start;
 }

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov