diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
| commit | d6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch) | |
| tree | e2be02f33984c48ec019c654051d27964e42c441 /arch/sparc64/kernel/devices.c | |
| parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) | |
Merge with 2.3.19.
Diffstat (limited to 'arch/sparc64/kernel/devices.c')
| -rw-r--r-- | arch/sparc64/kernel/devices.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/arch/sparc64/kernel/devices.c b/arch/sparc64/kernel/devices.c index 0aef0b019..d8085bf06 100644 --- a/arch/sparc64/kernel/devices.c +++ b/arch/sparc64/kernel/devices.c @@ -5,8 +5,9 @@ */ #include <linux/kernel.h> -#include <linux/tasks.h> +#include <linux/threads.h> #include <linux/init.h> +#include <linux/ioport.h> #include <asm/page.h> #include <asm/oplib.h> @@ -20,14 +21,18 @@ int linux_num_cpus = 0; extern void cpu_probe(void); extern unsigned long central_probe(unsigned long); -__initfunc(unsigned long -device_scan(unsigned long mem_start)) +unsigned long __init +device_scan(unsigned long mem_start) { char node_str[128]; int nd, prom_node_cpu, thismid; int cpu_nds[64]; /* One node for each cpu */ int cpu_ctr = 0; + /* FIX ME FAST... -DaveM */ + ioport_resource.end = 0xffffffffffffffffUL; + iomem_resource.end = 0xffffffffffffffffUL; + prom_getstring(prom_root_node, "device_type", node_str, sizeof(node_str)); prom_printf("Booting Linux...\n"); |