set_preferred_target_page_bits_common() is only used once
in set_preferred_target_page_bits(): inline it there and
remove its prototype.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
include/exec/page-vary.h | 1 -
page-vary-common.c | 33 +++++++++++++++------------------
2 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/include/exec/page-vary.h b/include/exec/page-vary.h
index 3c77689ca52..c4dc56634bc 100644
--- a/include/exec/page-vary.h
+++ b/include/exec/page-vary.h
@@ -41,7 +41,6 @@ typedef struct {
} TargetPageBits;
#ifdef IN_PAGE_VARY
-bool set_preferred_target_page_bits_common(int bits);
void finalize_target_page_bits_common(int min);
#endif
diff --git a/page-vary-common.c b/page-vary-common.c
index a2417354cc5..e2ccc7b0ead 100644
--- a/page-vary-common.c
+++ b/page-vary-common.c
@@ -27,29 +27,26 @@
TargetPageBits target_page;
-bool set_preferred_target_page_bits_common(int bits)
-{
- /*
- * The target page size is the lowest common denominator for all
- * the CPUs in the system, so we can only make it smaller, never
- * larger. And we can't make it smaller once we've committed to
- * a particular size.
- */
- if (target_page.bits == 0 || target_page.bits > bits) {
- if (target_page.decided) {
- return false;
- }
- target_page.bits = bits;
- }
- return true;
-}
-
bool set_preferred_target_page_bits(int bits)
{
assert(bits >= TARGET_PAGE_BITS_MIN);
+
if (target_page_bits_vary()) {
- return set_preferred_target_page_bits_common(bits);
+ /*
+ * The target page size is the lowest common denominator for all
+ * the CPUs in the system, so we can only make it smaller, never
+ * larger. And we can't make it smaller once we've committed to
+ * a particular size.
+ */
+ if (target_page.bits == 0 || target_page.bits > bits) {
+ if (target_page.decided) {
+ return false;
+ }
+ target_page.bits = bits;
+ }
+ return true;
}
+
return true;
}
--
2.52.0