31 lines
992 B
Diff
31 lines
992 B
Diff
From 0a7a9970e7211eaa71865b504d2b0a6c8fab7a78 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Gleixner <tglx@linutronix.de>
|
|
Date: Thu, 17 Mar 2011 11:02:15 +0100
|
|
Subject: [PATCH 004/286] 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 7da647d..5604455 100644
|
|
--- a/arch/x86/kernel/kprobes.c
|
|
+++ b/arch/x86/kernel/kprobes.c
|
|
@@ -478,7 +478,6 @@ static void __kprobes setup_singlestep(struct kprobe *p, struct pt_regs *regs,
|
|
* stepping.
|
|
*/
|
|
regs->ip = (unsigned long)p->ainsn.insn;
|
|
- preempt_enable_no_resched();
|
|
return;
|
|
}
|
|
#endif
|