diff options
author | Alex Shi <alex.shi@linaro.org> | 2017-11-09 04:02:01 (GMT) |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2017-11-09 04:02:01 (GMT) |
commit | 3871608e4cb995b0fb9c630da9ac45b246151fef (patch) | |
tree | 1a7d65ae9b815e73ec9ffe00d6a3778ab66d5dc8 /arch/arm64/kernel | |
parent | d177d7df2673ea81e8ee1e3d468398eeb7e580f5 (diff) | |
parent | 5caae9d1419914177994363218616b869659e871 (diff) | |
download | linux-3871608e4cb995b0fb9c630da9ac45b246151fef.tar.xz |
Merge tag 'v4.9.61' into linux-linaro-lsk-v4.9
This is the 4.9.61 stable release
Diffstat (limited to 'arch/arm64/kernel')
-rw-r--r-- | arch/arm64/kernel/traps.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c index 7501b40..f6c003e 100644 --- a/arch/arm64/kernel/traps.c +++ b/arch/arm64/kernel/traps.c @@ -113,7 +113,7 @@ static void __dump_instr(const char *lvl, struct pt_regs *regs) for (i = -4; i < 1; i++) { unsigned int val, bad; - bad = __get_user(val, &((u32 *)addr)[i]); + bad = get_user(val, &((u32 *)addr)[i]); if (!bad) p += sprintf(p, i == 0 ? "(%08x) " : "%08x ", val); |