diff options
| author | Ingo Molnar | 2013-04-16 11:04:10 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2013-04-16 11:04:10 +0200 |
| commit | b5210b2a34bae35fc00675462333af45676d727c (patch) | |
| tree | 43f67fb370571aedb0ec8a1ad7e8da61834d19b2 /arch/x86/include/asm | |
| parent | perf/x86: Add Sandy Bridge constraints for CYCLE_ACTIVITY.* (diff) | |
| parent | uprobes/perf: Avoid perf_trace_buf_prepare/submit if ->perf_events is empty (diff) | |
| download | kernel-qcow2-linux-b5210b2a34bae35fc00675462333af45676d727c.tar.gz kernel-qcow2-linux-b5210b2a34bae35fc00675462333af45676d727c.tar.xz kernel-qcow2-linux-b5210b2a34bae35fc00675462333af45676d727c.zip | |
Merge branch 'uprobes/core' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc into perf/core
Pull uprobes updates from Oleg Nesterov:
- "uretprobes" - an optimization to uprobes, like kretprobes are an optimization
to kprobes. "perf probe -x file sym%return" now works like kretprobes.
- PowerPC fixes plus a couple of cleanups/optimizations in uprobes and trace_uprobes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm')
| -rw-r--r-- | arch/x86/include/asm/uprobes.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/uprobes.h b/arch/x86/include/asm/uprobes.h index 8ff8be7835ab..6e5197910fd8 100644 --- a/arch/x86/include/asm/uprobes.h +++ b/arch/x86/include/asm/uprobes.h @@ -55,4 +55,5 @@ extern int arch_uprobe_post_xol(struct arch_uprobe *aup, struct pt_regs *regs); extern bool arch_uprobe_xol_was_trapped(struct task_struct *tsk); extern int arch_uprobe_exception_notify(struct notifier_block *self, unsigned long val, void *data); extern void arch_uprobe_abort_xol(struct arch_uprobe *aup, struct pt_regs *regs); +extern unsigned long arch_uretprobe_hijack_return_addr(unsigned long trampoline_vaddr, struct pt_regs *regs); #endif /* _ASM_UPROBES_H */ |