On Wed, Sep 13 2000, Mr. James W. Laferriere wrote:
>
> Hello Torben ,
> Has anyone caught this one yet . I assume it is just the same
> patch added (manually) to sr.c/h as well ? Tia , JimL
>
> drivers/scsi/scsidrv.o: In function `init_sr':
> drivers/scsi/scsidrv.o(.text+0x1cfce): undefined reference to
> `scsi_register_module'
> drivers/scsi/scsidrv.o: In function `exit_sr':
> drivers/scsi/scsidrv.o(.text+0x1cfe0): undefined reference to
> `scsi_unregister_module'
> make: *** [vmlinux] Error 1
>
>
Probaly, I prefer to revert to good old init/cleanup_module. Forcing
the new module_init with older non compatible drivers seems wrong.
I'll look into what needs to be done to get it clean.
The patch attached goes back to the old interface, please verify its
success. I'll then send it to Linus for test9-p1.
--
Torben Mathiasen <[EMAIL PROTECTED]>
Linux ThunderLAN maintainer
http://tlan.kernel.dk
diff -ur linux-2.4.0-test8/drivers/scsi/sr.c linux/drivers/scsi/sr.c
--- linux-2.4.0-test8/drivers/scsi/sr.c Wed Sep 13 23:24:42 2000
+++ linux/drivers/scsi/sr.c Wed Sep 13 23:54:26 2000
@@ -849,13 +849,15 @@
return;
}
-int init_sr(void)
+#ifdef MODULE
+
+int init_module(void)
{
sr_template.module = THIS_MODULE;
return scsi_register_module(MODULE_SCSI_DEV, &sr_template);
}
-void exit_sr(void)
+void cleanup_module(void)
{
scsi_unregister_module(MODULE_SCSI_DEV, &sr_template);
devfs_unregister_blkdev(MAJOR_NR, "sr");
@@ -879,5 +881,4 @@
sr_template.dev_max = 0;
}
-module_init(init_sr);
-module_exit(exit_sr);
+#endif /* MODULE */
