2001-10-06 02:26:46

by Udo A. Steinberg

[permalink] [raw]
Subject: Compile fixes for 2.4.10-ac7


Hi Alan,

Below is a patch for -ac7 that fixes a few gcc warnings, namely:

* Adds a missing return statement in ppro_with_ram_bug
* Ifdefs out disable_ide_dma because its only caller is also ifdef'd
out

Also note that the recent smbfs updates introduced a second definition
for ERRdiskfull in include/linux/smbno.h (lines 43, 107). I am not sure
which one needs to go.

Regards,
-Udo.

diff -urN linux-2.4.10-ac/arch/i386/kernel/dmi_scan.c linux-2.4.10-ac-mod/arch/i386/kernel/dmi_scan.c
--- linux-2.4.10-ac/arch/i386/kernel/dmi_scan.c Sat Oct 6 03:54:02 2001
+++ linux-2.4.10-ac-mod/arch/i386/kernel/dmi_scan.c Sat Oct 6 04:14:34 2001
@@ -190,7 +190,8 @@
* 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
@@ -203,6 +204,7 @@
#endif
return 0;
}
+#endif

/*
* Reboot options and system auto-detection code provided by
diff -urN linux-2.4.10-ac/arch/i386/kernel/setup.c linux-2.4.10-ac-mod/arch/i386/kernel/setup.c
--- linux-2.4.10-ac/arch/i386/kernel/setup.c Sat Oct 6 03:54:02 2001
+++ linux-2.4.10-ac-mod/arch/i386/kernel/setup.c Sat Oct 6 04:11:03 2001
@@ -2925,6 +2925,7 @@
return 1;
}
printk(KERN_INFO "Your Pentium Pro seems ok.\n");
+ return 0;
}

/*