Commit 08948cae authored by Wang Wensheng's avatar Wang Wensheng Committed by Steven Rostedt (Google)
Browse files

ftrace: Fix the possible incorrect kernel message 

If the number of mcount entries is an integer multiple of
ENTRIES_PER_PAGE, the page count showing on the console would be wrong.

Link: https://lkml.kernel.org/r/20221109094434.84046-2-wangwensheng4@huawei.com



Cc: <mhiramat@kernel.org>
Cc: <mark.rutland@arm.com>
Cc: stable@vger.kernel.org
Fixes: 5821e1b7 ("function tracing: fix wrong pos computing when read buffer has been fulfilled")
Signed-off-by: default avatarWang Wensheng <wangwensheng4@huawei.com>
Signed-off-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
parent bedf0683

kernel/trace/ftrace.c

+1 −1
Original line number Diff line number Diff line
@@ -7391,7 +7391,7 @@ void __init ftrace_init(void) 
	}



	pr_info("ftrace: allocating %ld entries in %ld pages\n",

		count, count / ENTRIES_PER_PAGE + 1);

		count, DIV_ROUND_UP(count, ENTRIES_PER_PAGE));



	ret = ftrace_process_locs(NULL,

				  __start_mcount_loc,