diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-10-20 11:02:05 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-10-20 11:02:05 +0200 |
| commit | ca4b9c3b743da39a6e0756a5c68edb35f6fc5e53 (patch) | |
| tree | 95ce0819f92e25bc4d768ab13cee1f385a83a7b2 /arch/x86/kernel/kprobes/core.c | |
| parent | a30b85df7d599f626973e9cd3056fe755bd778e0 (diff) | |
| parent | 275d34b82561e695339b782950d49c386169dae3 (diff) | |
| download | linux-stable-ca4b9c3b743da39a6e0756a5c68edb35f6fc5e53.tar.gz linux-stable-ca4b9c3b743da39a6e0756a5c68edb35f6fc5e53.tar.bz2 linux-stable-ca4b9c3b743da39a6e0756a5c68edb35f6fc5e53.zip | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/kprobes/core.c')
| -rw-r--r-- | arch/x86/kernel/kprobes/core.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c index b48e0efd668e..bd36f3c33cd0 100644 --- a/arch/x86/kernel/kprobes/core.c +++ b/arch/x86/kernel/kprobes/core.c @@ -1099,8 +1099,6 @@ int setjmp_pre_handler(struct kprobe *p, struct pt_regs *regs) * raw stack chunk with redzones: */ __memcpy(kcb->jprobes_stack, (kprobe_opcode_t *)addr, MIN_STACK_SIZE(addr)); - regs->flags &= ~X86_EFLAGS_IF; - trace_hardirqs_off(); regs->ip = (unsigned long)(jp->entry); /* |