git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/misc' into topic/misc
[pandora-kernel.git]
/
drivers
/
lguest
/
lguest_device.c
diff --git
a/drivers/lguest/lguest_device.c
b/drivers/lguest/lguest_device.c
index
b6200bc
..
69c84a1
100644
(file)
--- a/
drivers/lguest/lguest_device.c
+++ b/
drivers/lguest/lguest_device.c
@@
-15,6
+15,7
@@
#include <linux/interrupt.h>
#include <linux/virtio_ring.h>
#include <linux/err.h>
#include <linux/interrupt.h>
#include <linux/virtio_ring.h>
#include <linux/err.h>
+#include <linux/slab.h>
#include <asm/io.h>
#include <asm/paravirt.h>
#include <asm/lguest_hcall.h>
#include <asm/io.h>
#include <asm/paravirt.h>
#include <asm/lguest_hcall.h>
@@
-177,7
+178,7
@@
static void set_status(struct virtio_device *vdev, u8 status)
/* We set the status. */
to_lgdev(vdev)->desc->status = status;
/* We set the status. */
to_lgdev(vdev)->desc->status = status;
-
kvm_hypercall1(LHCALL_NOTIFY, (max_pfn << PAGE_SHIFT) + offset
);
+
hcall(LHCALL_NOTIFY, (max_pfn << PAGE_SHIFT) + offset, 0, 0, 0
);
}
static void lg_set_status(struct virtio_device *vdev, u8 status)
}
static void lg_set_status(struct virtio_device *vdev, u8 status)
@@
-228,7
+229,7
@@
static void lg_notify(struct virtqueue *vq)
*/
struct lguest_vq_info *lvq = vq->priv;
*/
struct lguest_vq_info *lvq = vq->priv;
-
kvm_hypercall1(LHCALL_NOTIFY, lvq->config.pfn << PAGE_SHIFT
);
+
hcall(LHCALL_NOTIFY, lvq->config.pfn << PAGE_SHIFT, 0, 0, 0
);
}
/* An extern declaration inside a C file is bad form. Don't do it. */
}
/* An extern declaration inside a C file is bad form. Don't do it. */