Unverified Commit ffc79dd7 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!2636 kernel/trace: Fix do not unregister tracepoints when register sched_migrate_task fail 

Merge Pull Request from: @ci-robot 
 
PR sync from: Wenyu Huang <huangwenyu4@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/YZ65TZJ7R54ZY4KYSGMYRM37MR4JAJRZ/ 
 
https://gitee.com/openeuler/kernel/issues/I8BAW8 
 
Link:https://gitee.com/openeuler/kernel/pulls/2636

 

Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Reviewed-by: default avatarZucheng Zheng <zhengzucheng@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 625fe3f7 da7446d3

kernel/trace/trace_sched_wakeup.c

+3 −1
Original line number Diff line number Diff line
@@ -642,7 +642,7 @@ static void start_wakeup_tracer(struct trace_array *tr) 
	if (ret) {

		pr_info("wakeup trace: Couldn't activate tracepoint"

			" probe to kernel_sched_migrate_task\n");

		return;

		goto fail_deprobe_sched_switch;

	}



	wakeup_reset(tr);
@@ -660,6 +660,8 @@ static void start_wakeup_tracer(struct trace_array *tr) 
		printk(KERN_ERR "failed to start wakeup tracer\n");



	return;

fail_deprobe_sched_switch:

	unregister_trace_sched_switch(probe_wakeup_sched_switch, NULL);

fail_deprobe_wake_new:

	unregister_trace_sched_wakeup_new(probe_wakeup, NULL);

fail_deprobe: