git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'stable-3.2' into pandora-3.2
[pandora-kernel.git]
/
drivers
/
infiniband
/
core
/
uverbs.h
diff --git
a/drivers/infiniband/core/uverbs.h
b/drivers/infiniband/core/uverbs.h
index
5bcb2af
..
228af18
100644
(file)
--- a/
drivers/infiniband/core/uverbs.h
+++ b/
drivers/infiniband/core/uverbs.h
@@
-69,7
+69,7
@@
*/
struct ib_uverbs_device {
*/
struct ib_uverbs_device {
-
struct kref ref
;
+
atomic_t refcount
;
int num_comp_vectors;
struct completion comp;
struct device *dev;
int num_comp_vectors;
struct completion comp;
struct device *dev;
@@
-78,6
+78,7
@@
struct ib_uverbs_device {
struct cdev cdev;
struct rb_root xrcd_tree;
struct mutex xrcd_tree_mutex;
struct cdev cdev;
struct rb_root xrcd_tree;
struct mutex xrcd_tree_mutex;
+ struct kobject kobj;
};
struct ib_uverbs_event_file {
};
struct ib_uverbs_event_file {