diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-02 14:32:44 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-02 14:32:44 -0800 |
| commit | 2741049e66d9698da5e0c90c849406fa3d3fc45c (patch) | |
| tree | 725c927121ccfe3eaa7df3b9b8e46610805f6b15 /drivers/message/fusion/mptbase.h | |
| parent | 2a298a35ebe060a6f2b06b20c2a34ea188ddfd37 (diff) | |
| parent | 4d5cda069b3f0a3bbc18576bc15903ed665d0295 (diff) | |
| download | op-kernel-dev-2741049e66d9698da5e0c90c849406fa3d3fc45c.zip op-kernel-dev-2741049e66d9698da5e0c90c849406fa3d3fc45c.tar.gz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
Diffstat (limited to 'drivers/message/fusion/mptbase.h')
| -rw-r--r-- | drivers/message/fusion/mptbase.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/message/fusion/mptbase.h b/drivers/message/fusion/mptbase.h index 5f5b3fb..bac8eb4 100644 --- a/drivers/message/fusion/mptbase.h +++ b/drivers/message/fusion/mptbase.h @@ -611,6 +611,8 @@ typedef struct _MPT_ADAPTER int DoneCtx; int TaskCtx; int InternalCtx; + spinlock_t initializing_hba_lock; + int initializing_hba_lock_flag; struct list_head list; struct net_device *netdev; struct list_head sas_topology; @@ -1001,6 +1003,7 @@ extern void mpt_free_fw_memory(MPT_ADAPTER *ioc); extern int mpt_findImVolumes(MPT_ADAPTER *ioc); extern int mpt_read_ioc_pg_3(MPT_ADAPTER *ioc); extern int mptbase_sas_persist_operation(MPT_ADAPTER *ioc, u8 persist_opcode); +extern int mpt_alt_ioc_wait(MPT_ADAPTER *ioc); /* * Public data decl's... |
