Commit 5a4ccaf3 authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Len Brown
Browse files

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: default avatarCheng Renquan <crquan@gmail.com>
Signed-off-by: default avatarMasami Hiramatsu <mhiramat@redhat.com>
Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Acked-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 33f1d7ec

arch/ia64/kernel/kprobes.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

arch/x86/kernel/kprobes.c

+1 −1
Original line number Diff line number Diff line
@@ -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();

kernel/kprobes.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE