patch-2.4.0-test9 linux/drivers/ieee1394/hosts.h

Next file: linux/drivers/ieee1394/ieee1394_core.c
Previous file: linux/drivers/ieee1394/hosts.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test8/linux/drivers/ieee1394/hosts.h linux/drivers/ieee1394/hosts.h
@@ -4,6 +4,7 @@
 
 #include <linux/wait.h>
 #include <linux/tqueue.h>
+#include <asm/semaphore.h>
 
 #include "ieee1394_types.h"
 #include "csr.h"
@@ -22,9 +23,8 @@
         /* A bitmask where a set bit means that this tlabel is in use.
          * FIXME - should be handled per node instead of per bus. */
         u32 tlabel_pool[2];
-        int tlabel_count;
+        struct semaphore tlabel_count;
         spinlock_t tlabel_lock;
-        wait_queue_head_t tlabel_wait;
 
         int reset_retries;
         quadlet_t *topology_map;

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