|
@@ -720,14 +720,14 @@ int rpmsg_send_offchannel_raw(struct rpmsg_channel *rpdev, u32 src, u32 dst,
|
|
|
mutex_lock(&vrp->tx_lock);
|
|
|
|
|
|
/* add message to the remote processor's virtqueue */
|
|
|
- err = virtqueue_add_buf_gfp(vrp->svq, &sg, 1, 0, msg, GFP_KERNEL);
|
|
|
+ err = virtqueue_add_buf(vrp->svq, &sg, 1, 0, msg, GFP_KERNEL);
|
|
|
if (err < 0) {
|
|
|
/*
|
|
|
* need to reclaim the buffer here, otherwise it's lost
|
|
|
* (memory won't leak, but rpmsg won't use it again for TX).
|
|
|
* this will wait for a buffer management overhaul.
|
|
|
*/
|
|
|
- dev_err(dev, "virtqueue_add_buf_gfp failed: %d\n", err);
|
|
|
+ dev_err(dev, "virtqueue_add_buf failed: %d\n", err);
|
|
|
goto out;
|
|
|
}
|
|
|
|
|
@@ -777,7 +777,7 @@ static void rpmsg_recv_done(struct virtqueue *rvq)
|
|
|
sg_init_one(&sg, msg, sizeof(*msg) + len);
|
|
|
|
|
|
/* add the buffer back to the remote processor's virtqueue */
|
|
|
- err = virtqueue_add_buf_gfp(vrp->rvq, &sg, 0, 1, msg, GFP_KERNEL);
|
|
|
+ err = virtqueue_add_buf(vrp->rvq, &sg, 0, 1, msg, GFP_KERNEL);
|
|
|
if (err < 0) {
|
|
|
dev_err(dev, "failed to add a virtqueue buffer: %d\n", err);
|
|
|
return;
|
|
@@ -907,7 +907,7 @@ static int rpmsg_probe(struct virtio_device *vdev)
|
|
|
|
|
|
sg_init_one(&sg, cpu_addr, RPMSG_BUF_SIZE);
|
|
|
|
|
|
- err = virtqueue_add_buf_gfp(vrp->rvq, &sg, 0, 1, cpu_addr,
|
|
|
+ err = virtqueue_add_buf(vrp->rvq, &sg, 0, 1, cpu_addr,
|
|
|
GFP_KERNEL);
|
|
|
WARN_ON(err < 0); /* sanity check; this can't really happen */
|
|
|
}
|