| From d8e3307cd7eefb33abceb05a47dd1cd8b504aac8 Mon Sep 17 00:00:00 2001 |
| From: Thomas Gleixner <tglx@linutronix.de> |
| Date: Thu, 17 Mar 2011 11:02:15 +0100 |
| Subject: [PATCH 003/262] x86: kprobes: Remove remove bogus preempt_enable |
| |
| The CONFIG_PREEMPT=n section of setup_singlestep() contains: |
| |
| preempt_enable_no_resched(); |
| |
| That's bogus as it is asymetric - no preempt_disable() - and it just |
| never blew up because preempt_enable_no_resched() is a NOP when |
| CONFIG_PREEMPT=n. Remove it. |
| |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| --- |
| arch/x86/kernel/kprobes.c | 1 - |
| 1 file changed, 1 deletion(-) |
| |
| diff --git a/arch/x86/kernel/kprobes.c b/arch/x86/kernel/kprobes.c |
| index e213fc8..b9edf1a 100644 |
| --- a/arch/x86/kernel/kprobes.c |
| +++ b/arch/x86/kernel/kprobes.c |
| @@ -486,7 +486,6 @@ setup_singlestep(struct kprobe *p, struct pt_regs *regs, struct kprobe_ctlblk *k |
| * stepping. |
| */ |
| regs->ip = (unsigned long)p->ainsn.insn; |
| - preempt_enable_no_resched(); |
| return; |
| } |
| #endif |
| -- |
| 1.7.10.4 |
| |
