From aa4074a16cd842a8608e73a295def644112298d2 Mon Sep 17 00:00:00 2001
From: Alexander Chiang <achiang@hp.com>
Date: Tue, 2 Feb 2010 19:09:16 +0000
Subject: [PATCH] --- yaml --- r: 184959 b: refs/heads/master c:
 17a55f79fd8051a6a8a6e84176c83af71877a98b h: refs/heads/master i:   184957:
 98bb8ebe0b7bb7c7e7fab02c876240e16abfd0a5   184955:
 956305ce2675277ed390b157dc3de9db217729c1   184951:
 09d1077ecea3b3fe85ef22c3a26c2445c2dd5230   184943:
 20f0af61d5325c1f797585a286782c0249ba1e2c   184927:
 c6c11fdf15f6aa745b2d814721cc41caffef65fe   184895:
 79714aeed5f42c28ff942c91f09998055ce9baf2   184831:
 7d72d5cbd42dfc6ed2e3286a9455353e58a083a0 v: v3

---
 [refs]                        | 2 +-
 trunk/include/rdma/ib_verbs.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b1fc067d8f22..08274e57f6c8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cdb8e43889a5d21ce706f5a93d3e1c9940cde1dc
+refs/heads/master: 17a55f79fd8051a6a8a6e84176c83af71877a98b
diff --git a/trunk/include/rdma/ib_verbs.h b/trunk/include/rdma/ib_verbs.h
index 09509edb1c5f..a585e0f92bc3 100644
--- a/trunk/include/rdma/ib_verbs.h
+++ b/trunk/include/rdma/ib_verbs.h
@@ -984,9 +984,9 @@ struct ib_device {
 	struct list_head              event_handler_list;
 	spinlock_t                    event_handler_lock;
 
+	spinlock_t                    client_data_lock;
 	struct list_head              core_list;
 	struct list_head              client_data_list;
-	spinlock_t                    client_data_lock;
 
 	struct ib_cache               cache;
 	int                          *pkey_tbl_len;
@@ -1144,8 +1144,8 @@ struct ib_device {
 		IB_DEV_UNREGISTERED
 	}                            reg_state;
 
-	u64			     uverbs_cmd_mask;
 	int			     uverbs_abi_ver;
+	u64			     uverbs_cmd_mask;
 
 	char			     node_desc[64];
 	__be64			     node_guid;