diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2021-03-21 22:16:08 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2021-03-21 22:16:08 +0100 |
| commit | ca8778c45e401067cefe2abbfb8b547c30d45908 (patch) | |
| tree | c10beaf40adb2bbc6a8933f87ff9da7a5366bf42 /arch/riscv/include/asm/ptrace.h | |
| parent | x86/kaslr: Return boolean values from a function returning bool (diff) | |
| parent | Merge tag 'io_uring-5.12-2021-03-21' of git://git.kernel.dk/linux-block (diff) | |
| download | linux-dev-ca8778c45e401067cefe2abbfb8b547c30d45908.tar.xz linux-dev-ca8778c45e401067cefe2abbfb8b547c30d45908.zip | |
Merge branch 'linus' into x86/cleanups, to resolve conflict
Conflicts:
arch/x86/kernel/kprobes/ftrace.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/riscv/include/asm/ptrace.h')
| -rw-r--r-- | arch/riscv/include/asm/ptrace.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/riscv/include/asm/ptrace.h b/arch/riscv/include/asm/ptrace.h index cb4abb639e8d..09ad4e923510 100644 --- a/arch/riscv/include/asm/ptrace.h +++ b/arch/riscv/include/asm/ptrace.h @@ -119,6 +119,11 @@ extern int regs_query_register_offset(const char *name); extern unsigned long regs_get_kernel_stack_nth(struct pt_regs *regs, unsigned int n); +void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr, + unsigned long frame_pointer); +int do_syscall_trace_enter(struct pt_regs *regs); +void do_syscall_trace_exit(struct pt_regs *regs); + /** * regs_get_register() - get register value from its offset * @regs: pt_regs from which register value is gotten |