patch-2.4.0-test3 linux/drivers/char/ip2/i2os.h

Next file: linux/drivers/char/ip2main.c
Previous file: linux/drivers/char/ip2/i2lib.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test2/linux/drivers/char/ip2/i2os.h linux/drivers/char/ip2/i2os.h
@@ -27,6 +27,7 @@
 
 #include "ip2types.h"
 #include <asm/io.h>  /* For inb, etc */
+#include <linux/version.h>
 
 //------------------------------------
 // Defines for I/O instructions:
@@ -61,7 +62,7 @@
 //#define SAVE_AND_DISABLE_INTS(a,b)	spin_lock_irqsave(a,b)
 //#define RESTORE_INTS(a,b)         	spin_unlock_irqrestore(a,b)
 
-#define LOCK_INIT(a)	spin_lock_init(a)
+#define LOCK_INIT(a)	rwlock_init(a)
 
 #define SAVE_AND_DISABLE_INTS(a,b) { \
 	/* printk("get_lock: 0x%x,%4d,%s\n",(int)a,__LINE__,__FILE__);*/ \

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)