Merge tag 'kgdb-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt...

[linux-2.6-microblaze.git] / mm / gup_benchmark.c

diff --git a/mm/gup_benchmark.c b/mm/gup_benchmark.c
index ad9d5b1..8dba38e 100644 (file)
--- a/mm/gup_benchmark.c
+++ b/mm/gup_benchmark.c
@@ -49,18 +49,21 @@ static int __gup_benchmark_ioctl(unsigned int cmd,
                        nr = (next - addr) / PAGE_SIZE;
                }
 
+               /* Filter out most gup flags: only allow a tiny subset here: */
+               gup->flags &= FOLL_WRITE;
+
                switch (cmd) {
                case GUP_FAST_BENCHMARK:
-                       nr = get_user_pages_fast(addr, nr, gup->flags & 1,
+                       nr = get_user_pages_fast(addr, nr, gup->flags,
                                                 pages + i);
                        break;
                case GUP_LONGTERM_BENCHMARK:
                        nr = get_user_pages(addr, nr,
-                                           (gup->flags & 1) | FOLL_LONGTERM,
+                                           gup->flags | FOLL_LONGTERM,
                                            pages + i, NULL);
                        break;
                case GUP_BENCHMARK:
-                       nr = get_user_pages(addr, nr, gup->flags & 1, pages + i,
+                       nr = get_user_pages(addr, nr, gup->flags, pages + i,
                                            NULL);
                        break;
                default: