Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa9d13cf authored by Zhaolei's avatar Zhaolei Committed by Ingo Molnar
Browse files

ftrace: don't try to __ftrace_replace_code on !FTRACE_FL_CONVERTED rec 



Do __ftrace_replace_code for !FTRACE_FL_CONVERTED rec will always
fail, we should ignore this rec.

Signed-off-by: default avatarZhao Lei <zhaolei@cn.fujitsu.com>
Cc: "Steven Rostedt ;" <rostedt@goodmis.org>
LKML-Reference: <49BA2472.4060206@cn.fujitsu.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent b00f0b6d

kernel/trace/ftrace.c

+5 −4
Original line number Diff line number Diff line
@@ -532,11 +532,12 @@ static void ftrace_replace_code(int enable) 


	do_for_each_ftrace_rec(pg, rec) {

		/*

		 * Skip over free records and records that have

		 * failed.

		 * Skip over free records, records that have

		 * failed and not converted.

		 */

		if (rec->flags & FTRACE_FL_FREE ||

		    rec->flags & FTRACE_FL_FAILED)

		    rec->flags & FTRACE_FL_FAILED ||

		    rec->flags & FTRACE_FL_CONVERTED)

			continue;



		/* ignore updates to this record's mcount site */
@@ -548,7 +549,7 @@ static void ftrace_replace_code(int enable) 
		}



		failed = __ftrace_replace_code(rec, enable);

		if (failed && (rec->flags & FTRACE_FL_CONVERTED)) {

		if (failed) {

			rec->flags |= FTRACE_FL_FAILED;

			if ((system_state == SYSTEM_BOOTING) ||

			    !core_kernel_text(rec->ip)) {