diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-10-05 01:18:40 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-10-05 01:18:40 +0000 |
| commit | 012bb3e61e5eced6c610f9e036372bf0c8def2d1 (patch) | |
| tree | 87efc733f9b164e8c85c0336f92c8fb7eff6d183 /drivers/ieee1394/hosts.h | |
| parent | 625a1589d3d6464b5d90b8a0918789e3afffd220 (diff) | |
Merge with Linux 2.4.0-test9. Please check DECstation, I had a number
of rejects to fixup while integrating Linus patches. I also found
that this kernel will only boot SMP on Origin; the UP kernel freeze
soon after bootup with SCSI timeout messages. I commit this anyway
since I found that the last CVS versions had the same problem.
Diffstat (limited to 'drivers/ieee1394/hosts.h')
| -rw-r--r-- | drivers/ieee1394/hosts.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ieee1394/hosts.h b/drivers/ieee1394/hosts.h index 3465f27d7..827a47416 100644 --- a/drivers/ieee1394/hosts.h +++ b/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 @@ struct hpsb_host { /* 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; |