summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWang Wensheng <wangwensheng4@huawei.com>2022-11-09 10:44:32 +0100
committerSteven Rostedt (Google) <rostedt@goodmis.org>2022-11-17 21:41:31 +0100
commit08948caebe93482db1adfd2154eba124f66d161d (patch)
tree23a3b8ed51029b1313bc6ad56faaad7aa62d6441
parenttracing: Fix warning on variable 'struct trace_array' (diff)
downloadlinux-08948caebe93482db1adfd2154eba124f66d161d.tar.xz
linux-08948caebe93482db1adfd2154eba124f66d161d.zip
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: 5821e1b74f0d0 ("function tracing: fix wrong pos computing when read buffer has been fulfilled") Signed-off-by: Wang Wensheng <wangwensheng4@huawei.com> Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
-rw-r--r--kernel/trace/ftrace.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 7dc023641bf1..8b13ce2eae70 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -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,