summaryrefslogtreecommitdiffstats
path: root/sys/dev/virtio
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2015-12-30 16:21:07 -0200
committerRenato Botelho <renato@netgate.com>2015-12-30 16:21:07 -0200
commitd8ff3484131f428fcc0727cd504acb5050a36490 (patch)
tree8adfbb5b779f497e621d29277fcbe1536012eeb0 /sys/dev/virtio
parent0319542cc712df59c57f014b4f925f516bcb5b4b (diff)
parentecf8336fcdf81e2aeb30a7ab82841dd7299ceb98 (diff)
downloadFreeBSD-src-d8ff3484131f428fcc0727cd504acb5050a36490.zip
FreeBSD-src-d8ff3484131f428fcc0727cd504acb5050a36490.tar.gz
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'sys/dev/virtio')
-rw-r--r--sys/dev/virtio/balloon/virtio_balloon.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/dev/virtio/balloon/virtio_balloon.c b/sys/dev/virtio/balloon/virtio_balloon.c
index a90a653..6d00ef3 100644
--- a/sys/dev/virtio/balloon/virtio_balloon.c
+++ b/sys/dev/virtio/balloon/virtio_balloon.c
@@ -438,8 +438,7 @@ vtballoon_alloc_page(struct vtballoon_softc *sc)
{
vm_page_t m;
- m = vm_page_alloc(NULL, 0, VM_ALLOC_NORMAL | VM_ALLOC_WIRED |
- VM_ALLOC_NOOBJ);
+ m = vm_page_alloc(NULL, 0, VM_ALLOC_NORMAL | VM_ALLOC_NOOBJ);
if (m != NULL)
sc->vtballoon_current_npages++;
@@ -450,7 +449,6 @@ static void
vtballoon_free_page(struct vtballoon_softc *sc, vm_page_t m)
{
- vm_page_unwire(m, 0);
vm_page_free(m);
sc->vtballoon_current_npages--;
}
OpenPOWER on IntegriCloud