patch-2.4.13 linux/drivers/scsi/dpt_i2o.c

• Lines: 57
• Date: Mon Oct 22 08:40:41 2001
• Orig file: v2.4.12/linux/drivers/scsi/dpt_i2o.c
• Orig date: Tue Oct 9 17:06:52 2001

diff -u --recursive --new-file v2.4.12/linux/drivers/scsi/dpt_i2o.c linux/drivers/scsi/dpt_i2o.c
@@ -78,9 +78,9 @@
 	{'d', 'P', 't', 'S', 'i', 'G'}, SIG_VERSION,
 #ifdef __i386__
 	PROC_INTEL, PROC_386 | PROC_486 | PROC_PENTIUM | PROC_SEXIUM,
-#elif defined __ia64__
+#elif defined(__ia64__)
 	PROC_INTEL, PROC_IA64,
-#elif define __sparc__
+#elif defined(__sparc__)
 	PROC_ULTRASPARC,
 #elif defined(__alpha__)
 	PROC_ALPHA ,
@@ -1152,12 +1152,12 @@
 	timeout *= HZ;
 	if((status = adpt_i2o_post_this(pHba, msg, len)) == 0){
 		if(!timeout){
-			current->state = TASK_INTERRUPTIBLE;
+			set_current_state(TASK_INTERRUPTIBLE);
 			spin_unlock_irq(&io_request_lock);
 			schedule();
 			spin_lock_irq(&io_request_lock);
 		} else {
-			current->state = TASK_INTERRUPTIBLE;
+			set_current_state(TASK_INTERRUPTIBLE);
 			spin_unlock_irq(&io_request_lock);
 			schedule_timeout(timeout*HZ);
 			spin_lock_irq(&io_request_lock);
@@ -1799,11 +1799,11 @@
 
 #if defined __i386__ 
 	adpt_i386_info(&si);
-#elif defined __ia64__
+#elif defined (__ia64__)
 	adpt_ia64_info(&si);
-#elif define __sparc__
+#elif defined(__sparc__)
 	adpt_sparc_info(&si);
-#elif defined __alpha__ 
+#elif defined (__alpha__)
 	adpt_alpha_info(&si);
 #else
 	si.processorType = 0xff ;
@@ -1838,7 +1838,7 @@
 #endif
 
 #if defined __alpha__ 
-static void adpt_sparc_info(sysInfo_S* si)
+static void adpt_alpha_info(sysInfo_S* si)
 {
 	// This is all the info we need for now
 	// We will add more info as our new
@@ -3324,4 +3324,4 @@
 static Scsi_Host_Template driver_template = DPT_I2O;
 #include "scsi_module.c"
 EXPORT_NO_SYMBOLS;
-MODULE_LICENSE("BSD without advertising clause");
+MODULE_LICENSE("GPL");