summaryrefslogtreecommitdiff
path: root/arch/x86
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2009-01-16 14:45:34 -0500
committerLen Brown <len.brown@intel.com>2009-01-16 14:45:34 -0500
commit88d998c264722cd6e8fafa42aee191f7d9194960 (patch)
tree72cfd34df16be3e6778ab585c8324e8f5677fe21 /arch/x86
parent79491ca416347f9e3c51993db556ba78bef44afa (diff)
parentd08ca2ca743f324eceba59e93188f9439e966bce (diff)
Merge branch 'misc' into release
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/kprobes.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/kprobes.c b/arch/x86/kernel/kprobes.c
index 884d985b8b82..e948b28a5a9a 100644
--- a/arch/x86/kernel/kprobes.c
+++ b/arch/x86/kernel/kprobes.c
@@ -446,7 +446,7 @@ void __kprobes arch_prepare_kretprobe(struct kretprobe_instance *ri,
static void __kprobes setup_singlestep(struct kprobe *p, struct pt_regs *regs,
struct kprobe_ctlblk *kcb)
{
-#if !defined(CONFIG_PREEMPT) || defined(CONFIG_PM)
+#if !defined(CONFIG_PREEMPT) || defined(CONFIG_FREEZER)
if (p->ainsn.boostable == 1 && !p->post_handler) {
/* Boost up -- we can execute copied instructions directly */
reset_current_kprobe();