Merge branches 'for-3.19/hid-report-len', 'for-3.19/i2c-hid', 'for-3.19/lenovo',...

[cascardo/linux.git] / include / linux / idr.h

diff --git a/include/linux/idr.h b/include/linux/idr.h
index 6af3400..013fd9b 100644 (file)
--- a/include/linux/idr.h
+++ b/include/linux/idr.h
@@ -29,21 +29,24 @@
 
 struct idr_layer {
        int                     prefix; /* the ID prefix of this idr_layer */
-       DECLARE_BITMAP(bitmap, IDR_SIZE); /* A zero bit means "space here" */
+       int                     layer;  /* distance from leaf */
        struct idr_layer __rcu  *ary[1<<IDR_BITS];
        int                     count;  /* When zero, we can release it */
-       int                     layer;  /* distance from leaf */
-       struct rcu_head         rcu_head;
+       union {
+               /* A zero bit means "space here" */
+               DECLARE_BITMAP(bitmap, IDR_SIZE);
+               struct rcu_head         rcu_head;
+       };
 };
 
 struct idr {
        struct idr_layer __rcu  *hint;  /* the last layer allocated from */
        struct idr_layer __rcu  *top;
-       struct idr_layer        *id_free;
        int                     layers; /* only valid w/o concurrent changes */
-       int                     id_free_cnt;
        int                     cur;    /* current pos for cyclic allocation */
        spinlock_t              lock;
+       int                     id_free_cnt;
+       struct idr_layer        *id_free;
 };
 
 #define IDR_INIT(name)                                                 \