summaryrefslogtreecommitdiff
path: root/usr/src/lib
diff options
context:
space:
mode:
authorToomas Soome <tsoome@me.com>2020-05-19 13:24:07 +0300
committerToomas Soome <tsoome@me.com>2021-03-10 10:12:37 +0200
commite3b270024f3e952233b61d3dcb4129ba75bf2720 (patch)
tree32241ca19c7344ec156fc9924cde9959035f3de9 /usr/src/lib
parent089ef9c1879ed031043f7bb75bd1f472558dcbbf (diff)
downloadillumos-joyent-e3b270024f3e952233b61d3dcb4129ba75bf2720.tar.gz
13520 udapl_tavor: symbol 'dapls_ib_dbp_lock' is multiply-defined
Reviewed by: Andy Fiddaman <andy@omniosce.org> Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src/lib')
-rw-r--r--usr/src/lib/udapl/udapl_tavor/tavor/dapl_tavor_hca.c1
-rw-r--r--usr/src/lib/udapl/udapl_tavor/tavor/dapl_tavor_ibtf_impl.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/usr/src/lib/udapl/udapl_tavor/tavor/dapl_tavor_hca.c b/usr/src/lib/udapl/udapl_tavor/tavor/dapl_tavor_hca.c
index 455bb077a8..5b01e20f39 100644
--- a/usr/src/lib/udapl/udapl_tavor/tavor/dapl_tavor_hca.c
+++ b/usr/src/lib/udapl/udapl_tavor/tavor/dapl_tavor_hca.c
@@ -68,6 +68,7 @@ static int dapli_process_fake_ibds(DAPL_HCA **hca_list, int hca_idx);
static DAPL_OS_LOCK g_tavor_state_lock;
static struct dapls_ib_hca_state g_tavor_state[MAX_HCAS];
DAPL_OS_LOCK g_tavor_uar_lock;
+DAPL_OS_LOCK dapls_ib_dbp_lock;
DAT_RETURN
dapli_init_hca(
diff --git a/usr/src/lib/udapl/udapl_tavor/tavor/dapl_tavor_ibtf_impl.h b/usr/src/lib/udapl/udapl_tavor/tavor/dapl_tavor_ibtf_impl.h
index ef089cccc8..9d0207f640 100644
--- a/usr/src/lib/udapl/udapl_tavor/tavor/dapl_tavor_ibtf_impl.h
+++ b/usr/src/lib/udapl/udapl_tavor/tavor/dapl_tavor_ibtf_impl.h
@@ -195,7 +195,7 @@ struct dapls_ib_hca_state {
char hca_path[MAXPATHLEN];
};
-DAPL_OS_LOCK dapls_ib_dbp_lock;
+extern DAPL_OS_LOCK dapls_ib_dbp_lock;
/* Function that returns a pointer to the specified doorbell entry */
uint32_t *dapls_ib_get_dbp(uint64_t maplen, int fd, uint64_t mapoffset,