Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

[firefly-linux-kernel-4.4.55.git] / drivers / infiniband / core / uverbs.h

diff --git a/drivers/infiniband/core/uverbs.h b/drivers/infiniband/core/uverbs.h
index 0b3862080c0f547259402dda2b89fd5720543931..a078e5624d22f700c0a526538e6e2926f5d2775f 100644 (file)
--- a/drivers/infiniband/core/uverbs.h
+++ b/drivers/infiniband/core/uverbs.h
@@ -41,6 +41,7 @@
 #include <linux/idr.h>
 #include <linux/mutex.h>
 #include <linux/completion.h>
+#include <linux/cdev.h>
 
 #include <rdma/ib_verbs.h>
 #include <rdma/ib_umem.h>
@@ -69,23 +70,23 @@
 
 struct ib_uverbs_device {
        struct kref                             ref;
+       int                                     num_comp_vectors;
        struct completion                       comp;
-       int                                     devnum;
-       struct cdev                            *cdev;
        struct device                          *dev;
        struct ib_device                       *ib_dev;
-       int                                     num_comp_vectors;
+       int                                     devnum;
+       struct cdev                             cdev;
 };
 
 struct ib_uverbs_event_file {
        struct kref                             ref;
+       int                                     is_async;
        struct ib_uverbs_file                  *uverbs_file;
        spinlock_t                              lock;
+       int                                     is_closed;
        wait_queue_head_t                       poll_wait;
        struct fasync_struct                   *async_queue;
        struct list_head                        event_list;
-       int                                     is_async;
-       int                                     is_closed;
 };
 
 struct ib_uverbs_file {