Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / include / linux / mlx5 / qp.h

diff --git a/include/linux/mlx5/qp.h b/include/linux/mlx5/qp.h
index 9709b30e2d690da604336a48f96d3757bb7d25c5..7c4c0f1f58054c3f4c9ad96f396eec079c07eb9c 100644 (file)
--- a/include/linux/mlx5/qp.h
+++ b/include/linux/mlx5/qp.h
@@ -342,10 +342,9 @@ struct mlx5_stride_block_ctrl_seg {
 };
 
 struct mlx5_core_qp {
+       struct mlx5_core_rsc_common     common; /* must be first */
        void (*event)           (struct mlx5_core_qp *, int);
        int                     qpn;
-       atomic_t                refcount;
-       struct completion       free;
        struct mlx5_rsc_debug   *dbg;
        int                     pid;
 };