diff options
| author | Brian Norris <computersforpeace@gmail.com> | 2016-10-28 19:05:25 -0700 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2016-10-28 19:05:25 -0700 |
| commit | 0e2ce9d3fcba5f92dd6c2b27d82690e49d0c0854 (patch) | |
| tree | a3413237c8dee15dfe620848fecb37408a096345 /arch/x86/um/ptrace_64.c | |
| parent | 30656167bd2347bf867a09cbae2705bd927d3983 (diff) | |
| parent | 8ff0513bdcdd71e84aa561cce216675d43fb41b8 (diff) | |
Merge tag 'nand/fixes-for-4.9-rc3' of github.com:linux-nand/linux
From Boris:
"""
Three simple fixes:
- the first one is fixing a non-critical bug in the gpmi driver
- the second one is fixing a bug in the 'automatic NAND timings
selection' feature introduced in 4.9-rc1
- the last one is fixing a false positive uninitialized-var warning
"""
Acked-by: Marek Vasut <marex@denx.de>
Diffstat (limited to 'arch/x86/um/ptrace_64.c')
| -rw-r--r-- | arch/x86/um/ptrace_64.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/um/ptrace_64.c b/arch/x86/um/ptrace_64.c index 0b5c184dd5b3..e30202b1716e 100644 --- a/arch/x86/um/ptrace_64.c +++ b/arch/x86/um/ptrace_64.c @@ -212,7 +212,8 @@ int is_syscall(unsigned long addr) * slow, but that doesn't matter, since it will be called only * in case of singlestepping, if copy_from_user failed. */ - n = access_process_vm(current, addr, &instr, sizeof(instr), 0); + n = access_process_vm(current, addr, &instr, sizeof(instr), + FOLL_FORCE); if (n != sizeof(instr)) { printk("is_syscall : failed to read instruction from " "0x%lx\n", addr); |