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

!15703 tracing: Make sure trace_printk() can output as soon as it can be used 

Merge Pull Request from: @ci-robot 
 
PR sync from: Tengda Wu <wutengda2@huawei.com>
https://mailweb.openeuler.org/archives/list/kernel@openeuler.org/message/R5VDLZVE7B53S3CX2KSF5RROVSUSLL6N/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBWVXX 
 
Link:https://gitee.com/openeuler/kernel/pulls/15703

 

Reviewed-by: default avatarYe Weihua <yeweihua4@huawei.com>
Reviewed-by: default avatarYuan Can <yuancan@huawei.com>
Signed-off-by: default avatarYuan Can <yuancan@huawei.com>
parents 1b432c59 31bf3272

kernel/trace/trace.c

+2 −0
Original line number Diff line number Diff line
@@ -8648,6 +8648,8 @@ void __init early_trace_init(void) 
			static_key_enable(&tracepoint_printk_key.key);

	}

	tracer_alloc_buffers();



	init_events();

}



void __init trace_init(void)

kernel/trace/trace.h

+1 −0
Original line number Diff line number Diff line
@@ -1509,6 +1509,7 @@ extern void trace_event_enable_cmd_record(bool enable); 
extern void trace_event_enable_tgid_record(bool enable);



extern int event_trace_init(void);

extern int init_events(void);

extern int event_trace_add_tracer(struct dentry *parent, struct trace_array *tr);

extern int event_trace_del_tracer(struct trace_array *tr);

kernel/trace/trace_output.c

+1 −2
Original line number Diff line number Diff line
@@ -1395,7 +1395,7 @@ static struct trace_event *events[] __initdata = { 
	NULL

};



__init static int init_events(void)

__init int init_events(void)

{

	struct trace_event *event;

	int i, ret;
@@ -1413,4 +1413,3 @@ __init static int init_events(void) 


	return 0;

}
 
early_initcall(init_events);