Merge branch 'for-5.1/hid-asus' into for-linus

[platform/kernel/linux-starfive.git] / drivers / xen / gntdev.c

diff --git a/drivers/xen/gntdev.c b/drivers/xen/gntdev.c
index b0b02a5..5efc5ee 100644 (file)
--- a/drivers/xen/gntdev.c
+++ b/drivers/xen/gntdev.c
@@ -520,26 +520,26 @@ static int unmap_if_in_range(struct gntdev_grant_map *map,
 }
 
 static int mn_invl_range_start(struct mmu_notifier *mn,
-                               struct mm_struct *mm,
-                               unsigned long start, unsigned long end,
-                               bool blockable)
+                              const struct mmu_notifier_range *range)
 {
        struct gntdev_priv *priv = container_of(mn, struct gntdev_priv, mn);
        struct gntdev_grant_map *map;
        int ret = 0;
 
-       if (blockable)
+       if (range->blockable)
                mutex_lock(&priv->lock);
        else if (!mutex_trylock(&priv->lock))
                return -EAGAIN;
 
        list_for_each_entry(map, &priv->maps, next) {
-               ret = unmap_if_in_range(map, start, end, blockable);
+               ret = unmap_if_in_range(map, range->start, range->end,
+                                       range->blockable);
                if (ret)
                        goto out_unlock;
        }
        list_for_each_entry(map, &priv->freeable_maps, next) {
-               ret = unmap_if_in_range(map, start, end, blockable);
+               ret = unmap_if_in_range(map, range->start, range->end,
+                                       range->blockable);
                if (ret)
                        goto out_unlock;
        }