diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-07 14:38:16 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-07 14:38:16 -0800 |
commit | c3abcabe813b4a0976b58f7e6c1e63b2070c8dda (patch) | |
tree | 72d7719e484340ddca3d5cf2710823f25a5d6542 /arch/x86/kernel/kprobes/common.h | |
parent | Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff) | |
parent | Merge branch 'linus' into perf/urgent, to resolve conflict (diff) | |
download | linux-dev-c3abcabe813b4a0976b58f7e6c1e63b2070c8dda.tar.xz linux-dev-c3abcabe813b4a0976b58f7e6c1e63b2070c8dda.zip |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar:
"This includes a fix for a crash if certain special addresses are
kprobed, plus does a rename of two Kconfig variables that were a minor
misnomer"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf/core: Rename CONFIG_[UK]PROBE_EVENT to CONFIG_[UK]PROBE_EVENTS
kprobes/x86: Fix kernel panic when certain exception-handling addresses are probed
Diffstat (limited to 'arch/x86/kernel/kprobes/common.h')
-rw-r--r-- | arch/x86/kernel/kprobes/common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/kprobes/common.h b/arch/x86/kernel/kprobes/common.h index c6ee63f927ab..d688826e5736 100644 --- a/arch/x86/kernel/kprobes/common.h +++ b/arch/x86/kernel/kprobes/common.h @@ -67,7 +67,7 @@ #endif /* Ensure if the instruction can be boostable */ -extern int can_boost(kprobe_opcode_t *instruction); +extern int can_boost(kprobe_opcode_t *instruction, void *addr); /* Recover instruction if given address is probed */ extern unsigned long recover_probed_instruction(kprobe_opcode_t *buf, unsigned long addr); |