> diff --git a/drivers/xen/evtchn.c b/drivers/xen/evtchn.c > index 6890897a6f30..10f1ef582659 100644 > --- a/drivers/xen/evtchn.c > +++ b/drivers/xen/evtchn.c > @@ -87,18 +87,6 @@ struct user_evtchn { > bool enabled; > }; > > -static evtchn_port_t *evtchn_alloc_ring(unsigned int size) > -{ > - evtchn_port_t *ring; > - size_t s = size * sizeof(*ring); > - > - ring = kmalloc(s, GFP_KERNEL); > - if (!ring) > - ring = vmalloc(s); > - > - return ring; > -} > - > static void evtchn_free_ring(evtchn_port_t *ring) > { > kvfree(ring); > @@ -334,7 +322,7 @@ static int evtchn_resize_ring(struct per_user_data *u) > else > new_size = 2 * u->ring_size; > > - new_ring = evtchn_alloc_ring(new_size); > + new_ring = kvmalloc(new_size * sizeof(*new_ring), GFP_KERNEL); > if (!new_ring) > return -ENOMEM; >
Xen bits: Reviewed-by: Boris Ostrovsky <boris.ostrov...@oracle.com>