rpmsg: rename virtqueue_add_buf_gfp to virtqueue_add_buf
Subsystems (2)
PATCH 1/1 rpmsg: rename virtqueue_add_buf_gfp to virtqueue_add_buf
Since commit 7bb7aef2 "virtio: rename virtqueue_add_buf_gfp to virtqueue_add_buf", virtqueue_add_buf_gfp is renamed to virtqueue_add_buf now.
This patch fixes below build error:
CC [M] drivers/rpmsg/virtio_rpmsg_bus.odrivers/rpmsg/virtio_rpmsg_bus.c: In function 'rpmsg_send_offchannel_raw':drivers/rpmsg/virtio_rpmsg_bus.c:723: error: implicit declaration of function 'virtqueue_add_buf_gfp' make[2]: *** [drivers/rpmsg/virtio_rpmsg_bus.o] Error 1
make[1]: *** [drivers/rpmsg] Error 2
make: *** [drivers] Error 2
---
I got the build error on linux-next 20111212.
So this patch is against linux-next.
Axel
drivers/rpmsg/virtio_rpmsg_bus.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
drivers/rpmsg/virtio_rpmsg_bus.c +4 -4
@@ -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 */ }
Signature · 1 line
1.7.5.4
Quoted 11 lines · Axel Lin
Since commit
7bb7aef2"virtio: renamevirtqueue_add_buf_gfptovirtqueue_add_buf",virtqueue_add_buf_gfpis renamed tovirtqueue_add_bufnow.This patch fixes below build error:
CC [M] drivers/rpmsg/virtio_rpmsg_bus.odrivers/rpmsg/virtio_rpmsg_bus.c: In function 'rpmsg_send_offchannel_raw':drivers/rpmsg/virtio_rpmsg_bus.c:723: error: implicit declaration of function 'virtqueue_add_buf_gfp' make[2]: *** [drivers/rpmsg/virtio_rpmsg_bus.o] Error 1
make[1]: *** [drivers/rpmsg] Error 2
make: *** [drivers] Error 2
Quoted 4 lines
Signed-off-by Axel Lin <[email protected]>---
I got the build error on linux-next 20111212.
So this patch is against linux-next.
Thanks a lot for the heads up, Axel !
Stephen, can you please carry this patch in linux-next ?
Thanks!
Ohad.
Hi,
Quoted 13 lines · On Tue, 13 Dec 2011 09:20:57 +0200 Ohad Ben-Cohen <[email protected]> wrote:
Quoted 11 lines · Axel Lin
Since commit
7bb7aef2"virtio: renamevirtqueue_add_buf_gfptovirtqueue_add_buf",virtqueue_add_buf_gfpis renamed tovirtqueue_add_bufnow.This patch fixes below build error:
CC [M] drivers/rpmsg/virtio_rpmsg_bus.odrivers/rpmsg/virtio_rpmsg_bus.c: In function 'rpmsg_send_offchannel_raw':drivers/rpmsg/virtio_rpmsg_bus.c:723: error: implicit declaration of function 'virtqueue_add_buf_gfp' make[2]: *** [drivers/rpmsg/virtio_rpmsg_bus.o] Error 1
make[1]: *** [drivers/rpmsg] Error 2
make: *** [drivers] Error 2
Quoted 8 lines
Quoted 4 lines
Signed-off-by Axel Lin <[email protected]>---
I got the build error on linux-next 20111212.
So this patch is against linux-next.Thanks a lot for the heads up, Axel !
Stephen, can you please carry this patch in linux-next ?
I seem to have mislaid my copy :-(
If Axel could send to to me again, I will put it in as a merge fix tomorrow.
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/