summaryrefslogtreecommitdiff
path: root/kernel/trace
diff options
context:
space:
mode:
authorWang Wensheng <wangwensheng4@huawei.com>2022-11-09 09:44:32 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-11-26 09:24:42 +0100
commit5c5f2642898f86ec43462d62fc7859c3655b1251 (patch)
tree8598c7f7f794fc627aaa0ac82c248fa22d0f09dd /kernel/trace
parent2ab2494162440b9edf4a244e23ec75b47d6f8b59 (diff)
downloadlinux-5c5f2642898f86ec43462d62fc7859c3655b1251.tar.gz
linux-5c5f2642898f86ec43462d62fc7859c3655b1251.tar.bz2
linux-5c5f2642898f86ec43462d62fc7859c3655b1251.zip
ftrace: Fix the possible incorrect kernel message
commit 08948caebe93482db1adfd2154eba124f66d161d upstream. 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/trace')
-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 c197f39fdb78..21b804f4f325 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -6870,7 +6870,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));
last_ftrace_enabled = ftrace_enabled = 1;