From 44fcdfb1a4735ab1f7bb84c795989e53e8f29f70 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Thu, 12 Jan 2012 09:00:27 +0200 Subject: [PATCH] --- yaml --- r: 295993 b: refs/heads/master c: b719587eb46c588fabc71de97c28bafcf827acf7 h: refs/heads/master i: 295991: 6bef0b87839f6bfc28be11ff05bf565456ddff89 v: v3 --- [refs] | 2 +- trunk/drivers/rpmsg/virtio_rpmsg_bus.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 6ffb909c407e..246217bd95df 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4ba60295ff4793e64fca91ffec9cc37f032b2a94 +refs/heads/master: b719587eb46c588fabc71de97c28bafcf827acf7 diff --git a/trunk/drivers/rpmsg/virtio_rpmsg_bus.c b/trunk/drivers/rpmsg/virtio_rpmsg_bus.c index 257683e7fe8a..8980ac2cc546 100644 --- a/trunk/drivers/rpmsg/virtio_rpmsg_bus.c +++ b/trunk/drivers/rpmsg/virtio_rpmsg_bus.c @@ -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 */ }