This renames PAGE_REPORTING_MIN_ORDER to PAGE_REPORTING_ORDER, to match with the variable name (@page_reporting_order). Its value is stick to @pageblock_order if architecture doesn't specify it. This is going to be used by arm64 when 64KB base page size is selected. Signed-off-by: Gavin Shan <gshan@xxxxxxxxxx> --- mm/page_reporting.c | 2 +- mm/page_reporting.h | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mm/page_reporting.c b/mm/page_reporting.c index 759b29f6e845..d4d9f5265d6b 100644 --- a/mm/page_reporting.c +++ b/mm/page_reporting.c @@ -10,7 +10,7 @@ #include "page_reporting.h" #include "internal.h" -unsigned int page_reporting_order = PAGE_REPORTING_MIN_ORDER; +unsigned int page_reporting_order = PAGE_REPORTING_ORDER; module_param(page_reporting_order, uint, 0644); MODULE_PARM_DESC(page_reporting_order, "Set page reporting order"); diff --git a/mm/page_reporting.h b/mm/page_reporting.h index 19d58a590cc2..91688dd30abe 100644 --- a/mm/page_reporting.h +++ b/mm/page_reporting.h @@ -10,9 +10,12 @@ #include <linux/pgtable.h> #include <linux/scatterlist.h> -#define PAGE_REPORTING_MIN_ORDER pageblock_order - #ifdef CONFIG_PAGE_REPORTING + +#ifndef PAGE_REPORTING_ORDER +#define PAGE_REPORTING_ORDER pageblock_order +#endif + DECLARE_STATIC_KEY_FALSE(page_reporting_enabled); extern unsigned int page_reporting_order; void __page_reporting_notify(void); -- 2.23.0