diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-11-21 13:07:23 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-11-21 13:07:23 (GMT) |
| commit | 96200591a34f8ecb98481c626125df43a2463b55 (patch) | |
| tree | 314c376b01f254d04f9aaf449b1f9147ad177fa6 /arch/x86/kernel/kprobes.c | |
| parent | 7031281e02bf951a2259849217193fb9d75a9762 (diff) | |
| parent | 68efa37df779b3e04280598e8b5b3a1919b65fee (diff) | |
| download | linux-96200591a34f8ecb98481c626125df43a2463b55.tar.xz | |
Merge branch 'tracing/hw-breakpoints' into perf/core
Conflicts:
arch/x86/kernel/kprobes.c
kernel/trace/Makefile
Merge reason: hw-breakpoints perf integration is looking
good in testing and in reviews, plus conflicts
are mounting up - so merge & resolve.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/kprobes.c')
| -rw-r--r-- | arch/x86/kernel/kprobes.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/x86/kernel/kprobes.c b/arch/x86/kernel/kprobes.c index c5f1f11..3fe86d7 100644 --- a/arch/x86/kernel/kprobes.c +++ b/arch/x86/kernel/kprobes.c @@ -56,6 +56,7 @@ #include <asm/uaccess.h> #include <asm/alternative.h> #include <asm/insn.h> +#include <asm/debugreg.h> void jprobe_return_end(void); @@ -945,8 +946,14 @@ int __kprobes kprobe_exceptions_notify(struct notifier_block *self, ret = NOTIFY_STOP; break; case DIE_DEBUG: - if (post_kprobe_handler(args->regs)) + if (post_kprobe_handler(args->regs)) { + /* + * Reset the BS bit in dr6 (pointed by args->err) to + * denote completion of processing + */ + (*(unsigned long *)ERR_PTR(args->err)) &= ~DR_STEP; ret = NOTIFY_STOP; + } break; case DIE_GPF: /* |