From 307f758a948b8180669bcf6421fc0205c23140a8 Mon Sep 17 00:00:00 2001
From: Masami Hiramatsu <mhiramat@redhat.com>
Date: Tue, 6 Jan 2009 21:15:32 +0100
Subject: [PATCH] --- yaml --- r: 129887 b: refs/heads/master c:
 5a4ccaf37ffece09ef33f1cfec67efa8ee56f967 h: refs/heads/master i:   129885:
 76ee6de7ef945fb63b74fb8e5c69df8a1db953ff   129883:
 47b754a6d6c965b7b063abd22e6ccfae882485fd   129879:
 526d278f768ec669593738354ecaf5af521cd314   129871:
 11cb294a4c8b7f421361308bc819351f086ba1c7   129855:
 97612db0727d3c6bb51bcb67dbbc6e95043fad47 v: v3

---
 [refs]                           | 2 +-
 trunk/arch/ia64/kernel/kprobes.c | 2 +-
 trunk/arch/x86/kernel/kprobes.c  | 2 +-
 trunk/kernel/kprobes.c           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 6d273ec723bb..a0da6a9d7f65 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 33f1d7ecc6cffff3c618a02295de969ebbacd95d
+refs/heads/master: 5a4ccaf37ffece09ef33f1cfec67efa8ee56f967
diff --git a/trunk/arch/ia64/kernel/kprobes.c b/trunk/arch/ia64/kernel/kprobes.c
index f90be51b1123..9adac441ac9b 100644
--- a/trunk/arch/ia64/kernel/kprobes.c
+++ b/trunk/arch/ia64/kernel/kprobes.c
@@ -870,7 +870,7 @@ static int __kprobes pre_kprobes_handler(struct die_args *args)
 		return 1;
 
 ss_probe:
-#if !defined(CONFIG_PREEMPT) || defined(CONFIG_PM)
+#if !defined(CONFIG_PREEMPT) || defined(CONFIG_FREEZER)
 	if (p->ainsn.inst_flag == INST_FLAG_BOOSTABLE && !p->post_handler) {
 		/* Boost up -- we can execute copied instructions directly */
 		ia64_psr(regs)->ri = p->ainsn.slot;
diff --git a/trunk/arch/x86/kernel/kprobes.c b/trunk/arch/x86/kernel/kprobes.c
index 884d985b8b82..e948b28a5a9a 100644
--- a/trunk/arch/x86/kernel/kprobes.c
+++ b/trunk/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();
diff --git a/trunk/kernel/kprobes.c b/trunk/kernel/kprobes.c
index 1b9cbdc0127a..7ba8cd9845cb 100644
--- a/trunk/kernel/kprobes.c
+++ b/trunk/kernel/kprobes.c
@@ -123,7 +123,7 @@ static int collect_garbage_slots(void);
 static int __kprobes check_safety(void)
 {
 	int ret = 0;
-#if defined(CONFIG_PREEMPT) && defined(CONFIG_PM)
+#if defined(CONFIG_PREEMPT) && defined(CONFIG_FREEZER)
 	ret = freeze_processes();
 	if (ret == 0) {
 		struct task_struct *p, *q;