git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'enforcement-4.14-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
arch
/
arm64
/
kernel
/
traps.c
diff --git
a/arch/arm64/kernel/traps.c
b/arch/arm64/kernel/traps.c
index 5ea4b85aee0e96e93c80a7aca339ffb2e987a53e..8383af15a7598409a05f34fce45ffde706e34bcb 100644
(file)
--- a/
arch/arm64/kernel/traps.c
+++ b/
arch/arm64/kernel/traps.c
@@
-118,7
+118,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);