Pull updates from Andrew Morton: "Most of -mm and quite a number of other subsystems: hotfixes, scripts, ocfs2, misc, lib, binfmt, init, reiserfs, exec, dma-mapping, kcov. MM is fairly quiet this time. Holidays, I assume" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (118 commits) kcov: ignore fault-inject and stacktrace include/linux/io-mapping.h-mapping: use PHYS_PFN() macro in io_mapping_map_atomic_wc() execve: warn if process starts with executable stack reiserfs: prevent NULL pointer dereference in reiserfs_insert_item() init/main.c: fix misleading "This architecture does not have kernel memory protection" message init/main.c: fix quoted value handling in unknown_bootoption init/main.c: remove unnecessary repair_env_string in do_initcall_level init/main.c: log arguments and environment passed to init fs/binfmt_elf.c: coredump: allow process with empty address space to coredump fs/binfmt_elf.c: coredump: delete duplicated overflow check fs/binfmt_elf.c: coredump: allocate core ELF header on stack fs/binfmt_elf.c: make BAD_ADDR() unlikely fs/binfmt_elf.c: better codegen around current->mm fs/binfmt_elf.c: don't copy ELF header around fs/binfmt_elf.c: fix ->start_code calculation fs/binfmt_elf.c: smaller code generation around auxv vector fill lib/find_bit.c: uninline helper _find_next_bit() lib/find_bit.c: join _find_next_bit{_le} uapi: rename ext2_swab() to swab() and share globally in swab.h lib/scatterlist.c: adjust indentation in __sg_alloc_table ...
Showing the changes to tools/testing (1 of 136 files). Show all
Unified · Split
| @@ -18,6 +18,9 @@ · 17 unmodified lines | ||
| 18 | 18 | #define GUP_LONGTERM_BENCHMARK _IOWR('g', 2, struct gup_benchmark) |
| 19 | 19 | #define GUP_BENCHMARK _IOWR('g', 3, struct gup_benchmark) |
| 20 | 20 | |
| 21 | +/* Just the flags we need, copied from mm.h: */ | |
| 22 | +#define FOLL_WRITE 0x01 /* check pte is writable */ | |
| 23 | + | |
| 21 | 24 | struct gup_benchmark { |
| 22 | 25 | __u64 get_delta_usec; |
| 23 | 26 | __u64 put_delta_usec; |
| @@ -85,7 +88,8 @@ int main(int argc, char **argv) · 61 unmodified lines | ||
| 85 | 88 | } |
| 86 | 89 | |
| 87 | 90 | gup.nr_pages_per_call = nr_pages; |
| 88 | − gup.flags = write; | |
| 91 | + if (write) | |
| 92 | + gup.flags |= FOLL_WRITE; | |
| 89 | 93 | |
| 90 | 94 | fd = open("/sys/kernel/debug/gup_benchmark", O_RDWR); |
| 91 | 95 | if (fd == -1) |