projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma
[linux-2.6-block.git]
/
drivers
/
infiniband
/
hw
/
mlx4
/
mlx4_ib.h
diff --git
a/drivers/infiniband/hw/mlx4/mlx4_ib.h
b/drivers/infiniband/hw/mlx4/mlx4_ib.h
index 8db7cb1a3716a0b8a6a37ab1b3641a50fbdec928..35141f451e5c75f01c9670432cf395c7cfcbbe77 100644
(file)
--- a/
drivers/infiniband/hw/mlx4/mlx4_ib.h
+++ b/
drivers/infiniband/hw/mlx4/mlx4_ib.h
@@
-448,7
+448,7
@@
struct mlx4_ib_demux_ctx {
struct workqueue_struct *wq;
struct workqueue_struct *ud_wq;
spinlock_t ud_lock;
-
__be64
subnet_prefix;
+
atomic64_t
subnet_prefix;
__be64 guid_cache[128];
struct mlx4_ib_dev *dev;
/* the following lock protects both mcg_table and mcg_mgid0_list */