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/ia64 | |
| parent | 79491ca416347f9e3c51993db556ba78bef44afa (diff) | |
| parent | d08ca2ca743f324eceba59e93188f9439e966bce (diff) | |
| download | kernel_samsung_crespo-88d998c264722cd6e8fafa42aee191f7d9194960.zip kernel_samsung_crespo-88d998c264722cd6e8fafa42aee191f7d9194960.tar.gz kernel_samsung_crespo-88d998c264722cd6e8fafa42aee191f7d9194960.tar.bz2 | |
Merge branch 'misc' into release
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/kernel/kprobes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/kprobes.c b/arch/ia64/kernel/kprobes.c index f90be51..9adac44 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; |