diff options
author | Ingo Molnar <mingo@kernel.org> | 2018-12-03 12:47:53 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2018-12-03 12:47:53 +0300 |
commit | df60673198ae678f68af54873b8904ba93fe13a0 (patch) | |
tree | 6e9a3393d0be7b68a69c2bbc58f4325ceb6fd853 /drivers/xen/pvcalls-front.c | |
parent | 89f579ce99f7e028e81885d3965f973c0f787611 (diff) | |
parent | 2595646791c319cadfdbf271563aac97d0843dc7 (diff) | |
download | linux-df60673198ae678f68af54873b8904ba93fe13a0.tar.xz |
Merge tag 'v4.20-rc5' into x86/cleanups, to sync up the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/xen/pvcalls-front.c')
-rw-r--r-- | drivers/xen/pvcalls-front.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/xen/pvcalls-front.c b/drivers/xen/pvcalls-front.c index 2f11ca72a281..77224d8f3e6f 100644 --- a/drivers/xen/pvcalls-front.c +++ b/drivers/xen/pvcalls-front.c @@ -385,8 +385,8 @@ static int create_active(struct sock_mapping *map, int *evtchn) out_error: if (*evtchn >= 0) xenbus_free_evtchn(pvcalls_front_dev, *evtchn); - kfree(map->active.data.in); - kfree(map->active.ring); + free_pages((unsigned long)map->active.data.in, PVCALLS_RING_ORDER); + free_page((unsigned long)map->active.ring); return ret; } |