patch-1.3.78 linux/arch/i386/mm/init.c
Next file: linux/drivers/block/floppy.c
Previous file: linux/arch/i386/kernel/smp.c
Back to the patch index
Back to the overall index
- Lines: 23
- Date:
Mon Mar 25 08:58:20 1996
- Orig file:
v1.3.77/linux/arch/i386/mm/init.c
- Orig date:
Sun Mar 17 09:04:04 1996
diff -u --recursive --new-file v1.3.77/linux/arch/i386/mm/init.c linux/arch/i386/mm/init.c
@@ -128,13 +128,15 @@
memset((void *) 0, 0, PAGE_SIZE);
#endif
#ifdef __SMP__
- smp_scan_config(0x0,0x400); /* Scan the bottom 1K for a signature */
- /*
- * FIXME: Linux assumes you have 640K of base ram.. this continues
- * the error...
- */
- smp_scan_config(639*0x400,0x400); /* Scan the top 1K of base RAM */
- smp_scan_config(0xF0000,0x10000); /* Scan the 64K of bios */
+ if (!smp_scan_config(0x0,0x400)) /* Scan the bottom 1K for a signature */
+ {
+ /*
+ * FIXME: Linux assumes you have 640K of base ram.. this continues
+ * the error...
+ */
+ if (!smp_scan_config(639*0x400,0x400)) /* Scan the top 1K of base RAM */
+ smp_scan_config(0xF0000,0x10000); /* Scan the 64K of bios */
+ }
/*
* If it is an SMP machine we should know now, unless the configuration
* is in an EISA/MCA bus machine with an extended bios data area. I don't
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov
with Sam's (original) version of this