diff options
| author | Masami Hiramatsu <mhiramat@redhat.com> | 2009-01-06 21:15:32 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-01-16 20:32:17 +0100 |
| commit | 5a4ccaf37ffece09ef33f1cfec67efa8ee56f967 (patch) | |
| tree | 9a246d76a019318f658c3db7567664cffb5f2824 /arch/ia64/kernel/kprobes.c | |
| parent | PM: Fix freezer compilation if PM_SLEEP is unset (diff) | |
| download | linux-5a4ccaf37ffece09ef33f1cfec67efa8ee56f967.tar.xz linux-5a4ccaf37ffece09ef33f1cfec67efa8ee56f967.zip | |
kprobes: check CONFIG_FREEZER instead of CONFIG_PM
Check CONFIG_FREEZER instead of CONFIG_PM because kprobe booster
depends on freeze_processes() and thaw_processes() when CONFIG_PREEMPT=y.
This fixes a linkage error which occurs when CONFIG_PREEMPT=y, CONFIG_PM=y
and CONFIG_FREEZER=n.
Reported-by: Cheng Renquan <crquan@gmail.com>
Signed-off-by: Masami Hiramatsu <mhiramat@redhat.com>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch/ia64/kernel/kprobes.c')
| -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 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; |