Merge branch 'drm-fixes-4.20' of git://people.freedesktop.org/~agd5f/linux into drm...

[linux-2.6-block.git] / mm / swap.c

diff --git a/mm/swap.c b/mm/swap.c
index 87a54c8dee3408ff9e07c1b9be3cae707ed56ba2..aa483719922e732a748620e58ef6c47194024c1b 100644 (file)
--- a/mm/swap.c
+++ b/mm/swap.c
@@ -964,7 +964,7 @@ void pagevec_remove_exceptionals(struct pagevec *pvec)
 
        for (i = 0, j = 0; i < pagevec_count(pvec); i++) {
                struct page *page = pvec->pages[i];
-               if (!radix_tree_exceptional_entry(page))
+               if (!xa_is_value(page))
                        pvec->pages[j++] = page;
        }
        pvec->nr = j;
@@ -1001,7 +1001,7 @@ EXPORT_SYMBOL(pagevec_lookup_range);
 
 unsigned pagevec_lookup_range_tag(struct pagevec *pvec,
                struct address_space *mapping, pgoff_t *index, pgoff_t end,
-               int tag)
+               xa_mark_t tag)
 {
        pvec->nr = find_get_pages_range_tag(mapping, index, end, tag,
                                        PAGEVEC_SIZE, pvec->pages);
@@ -1011,7 +1011,7 @@ EXPORT_SYMBOL(pagevec_lookup_range_tag);
 
 unsigned pagevec_lookup_range_nr_tag(struct pagevec *pvec,
                struct address_space *mapping, pgoff_t *index, pgoff_t end,
-               int tag, unsigned max_pages)
+               xa_mark_t tag, unsigned max_pages)
 {
        pvec->nr = find_get_pages_range_tag(mapping, index, end, tag,
                min_t(unsigned int, max_pages, PAGEVEC_SIZE), pvec->pages);