diff --git a/[refs] b/[refs] index 246217bd95df..ba7e997f7726 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b719587eb46c588fabc71de97c28bafcf827acf7 +refs/heads/master: dd6da1c5e99a3b736b52370c504a2b8843cbfda6 diff --git a/trunk/drivers/remoteproc/remoteproc_rpmsg.c b/trunk/drivers/remoteproc/remoteproc_rpmsg.c index f30be4c193ef..4f73e811bb80 100644 --- a/trunk/drivers/remoteproc/remoteproc_rpmsg.c +++ b/trunk/drivers/remoteproc/remoteproc_rpmsg.c @@ -96,7 +96,11 @@ static struct virtqueue *rp_find_vq(struct virtio_device *vdev, dev_dbg(rproc->dev, "vring%d: va %p qsz %d\n", id, addr, len); - vq = vring_new_virtqueue(len, AMP_VRING_ALIGN, vdev, addr, + /* + * Create the new vq, and tell virtio we're not interested in + * the 'weak' smp barriers, since we're talking with a real device. + */ + vq = vring_new_virtqueue(len, AMP_VRING_ALIGN, vdev, false, addr, rproc_virtio_notify, callback, name); if (!vq) { dev_err(rproc->dev, "vring_new_virtqueue %s failed\n", name);