diff options
| author | Felipe Franciosi <felipe@nutanix.com> | 2020-08-12 12:30:32 +0100 |
|---|---|---|
| committer | Felipe Franciosi <felipe@nutanix.com> | 2020-08-12 14:29:12 +0100 |
| commit | 32ecc953998b1a66065d7097ea7a65789f039428 (patch) | |
| tree | 2cf2e5007f8a3334b7c87b21335ab9de751e65cd /kmod | |
| parent | f3523febf3f8ebc7946cefeef47eabe66ea1344c (diff) | |
| download | libvfio-user-32ecc953998b1a66065d7097ea7a65789f039428.zip libvfio-user-32ecc953998b1a66065d7097ea7a65789f039428.tar.gz libvfio-user-32ecc953998b1a66065d7097ea7a65789f039428.tar.bz2 | |
muser.ko: Update for Linux 5.8
This fixes vfio.diff to apply cleanly on Linux 5.8 and renames
vm_insert_pages to _vm_insert_pages because an upstream function of the
same name has been added to the kernel since. Future work will include
replacing our version of vm_insert_pages with the upstream and redo all
necessary testing.
We also update travis to use v5.8.
Signed-off-by: Felipe Franciosi <felipe@nutanix.com>
Signed-off-by: Swapnil Ingle <swapnil.ingle@nutanix.com>
Diffstat (limited to 'kmod')
| -rw-r--r-- | kmod/muser.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kmod/muser.c b/kmod/muser.c index edb6c77..8ac2549 100644 --- a/kmod/muser.c +++ b/kmod/muser.c @@ -448,8 +448,8 @@ static void unpin_pages(struct page_map *const pg_map) pg_map->pages = NULL; } -static int vm_insert_pages(struct vm_area_struct *const vma, - struct page *const pages[], const int nr_pages) +static int _vm_insert_pages(struct vm_area_struct *const vma, + struct page *const pages[], const int nr_pages) { int err = 0, i; @@ -1224,7 +1224,7 @@ static int muser_mmap(struct mdev_device *const mdev, return err; } - return vm_insert_pages(vma, mucmd.pg_map.pages, mucmd.pg_map.nr_pages); + return _vm_insert_pages(vma, mucmd.pg_map.pages, mucmd.pg_map.nr_pages); } struct mdev_parent_ops muser_mdev_fops = { |