summaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/stacktrace.h
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2018-09-25 11:30:47 -0700
committerOlof Johansson <olof@lixom.net>2018-09-25 11:30:47 -0700
commitcdddeefc39cc26b2d429f8f7ea3c35bf8cb8c6a1 (patch)
tree2628d4922d0675df5659439f22f5ebda9c4b302a /arch/x86/include/asm/stacktrace.h
parentbf1da406909b13903873d1f91346f99303fd8cb3 (diff)
parent11da3a7f84f19c26da6f86af878298694ede0804 (diff)
Merge tag 'v4.19-rc3' into next/drivers
Linux 4.19-rc3
Diffstat (limited to 'arch/x86/include/asm/stacktrace.h')
-rw-r--r--arch/x86/include/asm/stacktrace.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/stacktrace.h b/arch/x86/include/asm/stacktrace.h
index b6dc698f992a..f335aad404a4 100644
--- a/arch/x86/include/asm/stacktrace.h
+++ b/arch/x86/include/asm/stacktrace.h
@@ -111,6 +111,6 @@ static inline unsigned long caller_frame_pointer(void)
return (unsigned long)frame;
}
-void show_opcodes(u8 *rip, const char *loglvl);
+void show_opcodes(struct pt_regs *regs, const char *loglvl);
void show_ip(struct pt_regs *regs, const char *loglvl);
#endif /* _ASM_X86_STACKTRACE_H */