Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Wang Wensheng <wangwensheng4@huawei.com>
To:     <linux-kernel@vger.kernel.org>, <rostedt@goodmis.org>,
        <mhiramat@kernel.org>, <mark.rutland@arm.com>
CC:     <xuqiang36@huawei.com>, <weiyongjun1@huawei.com>,
        <wangwensheng4@huawei.com>
Subject: [PATCH -next 1/3] ftrace: Fix the possible incorrect kernel message
Date:   Wed, 9 Nov 2022 09:44:32 +0000
Message-ID: <20221109094434.84046-2-wangwensheng4@huawei.com>
In-Reply-To: <20221109094434.84046-1-wangwensheng4@huawei.com>
References: <20221109094434.84046-1-wangwensheng4@huawei.com>
MIME-Version: 1.0
Content-Type: text/plain
Precedence: bulk

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

Signed-off-by: Wang Wensheng <wangwensheng4@huawei.com>
---
 kernel/trace/ftrace.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index fbf2543111c0..c571c2813c11 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -7401,7 +7401,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,
-- 
2.17.1