Update of /cvsroot/linuxconsole/ruby/linux/arch/i386/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv13236/linux/arch/i386/kernel
Modified Files:
apm.c dmi_scan.c setup.c
Log Message:
Synced to 2.5.22
Index: apm.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/i386/kernel/apm.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- apm.c 4 Jun 2002 19:45:04 -0000 1.6
+++ apm.c 18 Jun 2002 18:51:54 -0000 1.7
@@ -848,6 +848,7 @@
case 1: apm_idle_done = 1;
break;
default: /* BIOS refused */
+ ;
}
}
if (original_pm_idle)
Index: dmi_scan.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/i386/kernel/dmi_scan.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- dmi_scan.c 16 May 2002 18:01:36 -0000 1.7
+++ dmi_scan.c 18 Jun 2002 18:51:54 -0000 1.8
@@ -185,28 +185,6 @@
#define NO_MATCH { NONE, NULL}
#define MATCH(a,b) { a, b }
-/*
- * We have problems with IDE DMA on some platforms. In paticular the
- * KT7 series. On these it seems the newer BIOS has fixed them. The
- * rule needs to be improved to match specific BIOS revisions with
- * corruption problems
- */
-
-#if 0
-static __init int disable_ide_dma(struct dmi_blacklist *d)
-{
-#ifdef CONFIG_BLK_DEV_IDE
- extern int noautodma;
- if(noautodma == 0)
- {
- noautodma = 1;
- printk(KERN_INFO "%s series board detected. Disabling IDE DMA.\n", d->ident);
- }
-#endif
- return 0;
-}
-#endif
-
/*
* Reboot options and system auto-detection code provided by
* Dell Computer Corporation so their systems "just work". :-)
@@ -503,12 +481,6 @@
*/
static __initdata struct dmi_blacklist dmi_blacklist[]={
-#if 0
- { disable_ide_dma, "KT7", { /* Overbroad right now - kill DMA on problem KT7 boards */
- MATCH(DMI_PRODUCT_NAME, "KT7-RAID"),
- NO_MATCH, NO_MATCH, NO_MATCH
- } },
-#endif
{ broken_ps2_resume, "Dell Latitude C600", { /* Handle problems with APM on the C600 */
MATCH(DMI_SYS_VENDOR, "Dell"),
MATCH(DMI_PRODUCT_NAME, "Latitude C600"),
Index: setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/i386/kernel/setup.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- setup.c 15 Jun 2002 19:17:08 -0000 1.46
+++ setup.c 18 Jun 2002 18:51:54 -0000 1.47
@@ -31,6 +31,7 @@
#endif
#include <linux/bootmem.h>
#include <linux/seq_file.h>
+#include <linux/root_dev.h>
#include <linux/highmem.h>
#include <asm/e820.h>
#include <asm/mpspec.h>
@@ -599,7 +600,7 @@
visws_get_board_type_and_rev();
#endif
- ROOT_DEV = to_kdev_t(ORIG_ROOT_DEV);
+ ROOT_DEV = ORIG_ROOT_DEV;
drive_info = DRIVE_INFO;
screen_info = SCREEN_INFO;
apm_info.bios = APM_BIOS_INFO;
@@ -882,7 +883,6 @@
low_mem_size = ((max_low_pfn << PAGE_SHIFT) + 0xfffff) & ~0xfffff;
if (low_mem_size > pci_mem_start)
pci_mem_start = low_mem_size;
-
dmi_scan_machine();
}
|
