diff options
| author | Len Brown <len.brown@intel.com> | 2009-01-16 14:45:34 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-01-16 14:45:34 -0500 |
| commit | 88d998c264722cd6e8fafa42aee191f7d9194960 (patch) | |
| tree | 72cfd34df16be3e6778ab585c8324e8f5677fe21 /arch | |
| parent | 79491ca416347f9e3c51993db556ba78bef44afa (diff) | |
| parent | d08ca2ca743f324eceba59e93188f9439e966bce (diff) | |
| download | blackbird-op-linux-88d998c264722cd6e8fafa42aee191f7d9194960.tar.gz blackbird-op-linux-88d998c264722cd6e8fafa42aee191f7d9194960.zip | |
Merge branch 'misc' into release
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ia64/kernel/kprobes.c | 2 | ||||
| -rw-r--r-- | arch/x86/kernel/kprobes.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/kernel/kprobes.c b/arch/ia64/kernel/kprobes.c index f90be51b1123..9adac441ac9b 100644 --- a/arch/ia64/kernel/kprobes.c +++ b/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/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(); |
