IDE subsystem fails to compile without proc support because
ide_remove_proc_entries is called but not defined. Other uses of the
function are properly ifdef'ed, the following in ide-disk.c and
ide-floppy.c are not.
Please apply.
Robert Love
diff -urN linux-2.4.17-pre1/drivers/ide/ide-disk.c linux/drivers/ide/ide-disk.c
--- linux-2.4.17-pre1/drivers/ide/ide-disk.c Wed Nov 28 15:15:35 2001
+++ linux/drivers/ide/ide-disk.c Wed Nov 28 17:05:07 2001
@@ -856,10 +856,12 @@
printk (KERN_ERR "%s: cleanup_module() called while still busy\n", drive->name);
failed++;
}
/* We must remove proc entries defined in this module.
Otherwise we oops while accessing these entries */
+#ifdef CONFIG_PROC_FS
if (drive->proc)
ide_remove_proc_entries(drive->proc, idedisk_proc);
+#endif
}
ide_unregister_module(&idedisk_module);
}
diff -urN linux-2.4.17-pre1/drivers/ide/ide-floppy.c linux/drivers/ide/ide-floppy.c
--- linux-2.4.17-pre1/drivers/ide/ide-floppy.c Wed Nov 28 15:15:35 2001
+++ linux/drivers/ide/ide-floppy.c Wed Nov 28 17:09:21 2001
@@ -2071,8 +2071,10 @@
}
/* We must remove proc entries defined in this module.
Otherwise we oops while accessing these entries */
+#ifdef CONFIG_PROC_FS
if (drive->proc)
ide_remove_proc_entries(drive->proc, idefloppy_proc);
+#endif
}
ide_unregister_module(&idefloppy_module);
}
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Fri Nov 30 2001 - 21:00:32 EST