diff options
author | David S. Miller <davem@davemloft.net> | 2012-07-22 12:19:24 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-07-22 12:19:24 -0700 |
commit | 5dc7c77967a64a1c2cb1a45f45f580fa18927a4c (patch) | |
tree | 286a35eef8b89d95968166445e568fc7c125582e /drivers/vhost/vhost.c | |
parent | 2a304bb8fa6a60cf6039f9a686798ec330f198ef (diff) | |
parent | 163049aefdc04323a2d17ec9f2862027b43b0502 (diff) |
Merge branch 'vhost-net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Diffstat (limited to 'drivers/vhost/vhost.c')
-rw-r--r-- | drivers/vhost/vhost.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c index 112156f68afb..ef82a0d18489 100644 --- a/drivers/vhost/vhost.c +++ b/drivers/vhost/vhost.c @@ -64,7 +64,7 @@ static int vhost_poll_wakeup(wait_queue_t *wait, unsigned mode, int sync, return 0; } -static void vhost_work_init(struct vhost_work *work, vhost_work_fn_t fn) +void vhost_work_init(struct vhost_work *work, vhost_work_fn_t fn) { INIT_LIST_HEAD(&work->node); work->fn = fn; @@ -137,8 +137,7 @@ void vhost_poll_flush(struct vhost_poll *poll) vhost_work_flush(poll->dev, &poll->work); } -static inline void vhost_work_queue(struct vhost_dev *dev, - struct vhost_work *work) +void vhost_work_queue(struct vhost_dev *dev, struct vhost_work *work) { unsigned long flags; |