On Fri, 2 Oct 2020 16:06:26 -0400 Matthew Rosato <mjrosato@xxxxxxxxxxxxx> wrote: > PLACEHOLDER as the kernel patch driving the need for this ("vfio-pci/zdev: > define the vfio_zdev header") isn't merged yet. > > Signed-off-by: Matthew Rosato <mjrosato@xxxxxxxxxxxxx> > --- > .../drivers/infiniband/hw/vmw_pvrdma/pvrdma_ring.h | 14 +++++++------- > linux-headers/linux/kvm.h | 6 ++++-- > linux-headers/linux/vfio.h | 5 +++++ > 3 files changed, 16 insertions(+), 9 deletions(-) > > diff --git a/include/standard-headers/drivers/infiniband/hw/vmw_pvrdma/pvrdma_ring.h b/include/standard-headers/drivers/infiniband/hw/vmw_pvrdma/pvrdma_ring.h > index 7b4062a..acd4c83 100644 > --- a/include/standard-headers/drivers/infiniband/hw/vmw_pvrdma/pvrdma_ring.h > +++ b/include/standard-headers/drivers/infiniband/hw/vmw_pvrdma/pvrdma_ring.h > @@ -68,7 +68,7 @@ static inline int pvrdma_idx_valid(uint32_t idx, uint32_t max_elems) > > static inline int32_t pvrdma_idx(int *var, uint32_t max_elems) > { > - const unsigned int idx = qatomic_read(var); > + const unsigned int idx = atomic_read(var); Hm... either this shouldn't have been renamed to qatomic_read() in the first place, or we need to add some post-processing to the update script. > > if (pvrdma_idx_valid(idx, max_elems)) > return idx & (max_elems - 1);