RDMA/mlx5: Guard ODP specific assignments with specific CONFIG
authorLeon Romanovsky <leonro@mellanox.com>
Tue, 13 Mar 2018 13:29:27 +0000 (15:29 +0200)
committerDoug Ledford <dledford@redhat.com>
Thu, 15 Mar 2018 14:59:58 +0000 (10:59 -0400)
"live" is needed for ODP only and is better to be guarded
by appropriate CONFIG.

Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
drivers/infiniband/hw/mlx5/mr.c

index 413f90af1bcbd5236d758deeea2ffefe645ebd59..e520b941fc4d36e39c270d6131e3f8d61d9cd287 100644 (file)
@@ -1296,7 +1296,9 @@ struct ib_mr *mlx5_ib_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,
                }
        }
 
+#ifdef CONFIG_INFINIBAND_ON_DEMAND_PAGING
        mr->live = 1;
+#endif
        return &mr->ibmr;
 error:
        ib_umem_release(umem);
@@ -1405,7 +1407,9 @@ int mlx5_ib_rereg_user_mr(struct ib_mr *ib_mr, int flags, u64 start,
                }
 
                mr->allocated_from_cache = 0;
+#ifdef CONFIG_INFINIBAND_ON_DEMAND_PAGING
                mr->live = 1;
+#endif
        } else {
                /*
                 * Send a UMR WQE