patch-1.3.34 linux/drivers/scsi/scsi.c

Next file: linux/drivers/sound/.blurb
Previous file: linux/drivers/scsi/fdomain.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.33/linux/drivers/scsi/scsi.c linux/drivers/scsi/scsi.c
@@ -2259,6 +2259,8 @@
 }
 
 
+int scsi_loadable_module_flag; /* Set after we scan builtin drivers */
+
 void * scsi_init_malloc(unsigned int size, int priority)
 {
     void * retval;
@@ -2351,6 +2353,9 @@
     /* Yes we're here... */
     dispatch_scsi_info_ptr = dispatch_scsi_info;
 
+    /* Init a few things so we can "malloc" memory. */
+    scsi_loadable_module_flag = 0;
+    
     timer_table[SCSI_TIMER].fn = scsi_main_timeout;
     timer_table[SCSI_TIMER].expires = 0;
 
@@ -2435,6 +2440,8 @@
     for(sdtpnt = scsi_devicelist; sdtpnt; sdtpnt = sdtpnt->next)
 	if(sdtpnt->finish && sdtpnt->nr_dev)
 	    (*sdtpnt->finish)();
+
+    scsi_loadable_module_flag = 1;
 
     return 0;
 }

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