The quilt patch titled
Subject: mm: page_alloc: move is_check_pages_enabled() into page_alloc.c
has been removed from the -mm tree. Its filename was
mm-page_alloc-move-is_check_pages_enabled-into-page_allocc.patch
This patch was dropped because it was merged into the mm-stable branch
of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Kefeng Wang <wangkefeng.wang@xxxxxxxxxx>
Subject: mm: page_alloc: move is_check_pages_enabled() into page_alloc.c
Date: Tue, 16 May 2023 14:38:21 +0800
The is_check_pages_enabled() only used in page_alloc.c, move it into
page_alloc.c, also use it in free_tail_page_prepare().
Link: https://lkml.kernel.org/r/20230516063821.121844-14-wangkefeng.wang@xxxxxxxxxx
Signed-off-by: Kefeng Wang <wangkefeng.wang@xxxxxxxxxx>
Cc: David Hildenbrand <david@xxxxxxxxxx>
Cc: "Huang, Ying" <ying.huang@xxxxxxxxx>
Cc: Iurii Zaikin <yzaikin@xxxxxxxxxx>
Cc: Kees Cook <keescook@xxxxxxxxxxxx>
Cc: Len Brown <len.brown@xxxxxxxxx>
Cc: Luis Chamberlain <mcgrof@xxxxxxxxxx>
Cc: Mike Rapoport (IBM) <rppt@xxxxxxxxxx>
Cc: Oscar Salvador <osalvador@xxxxxxx>
Cc: Pavel Machek <pavel@xxxxxx>
Cc: Rafael J. Wysocki <rafael@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/internal.h | 5 -----
mm/page_alloc.c | 7 ++++++-
2 files changed, 6 insertions(+), 6 deletions(-)
--- a/mm/internal.h~mm-page_alloc-move-is_check_pages_enabled-into-page_allocc
+++ a/mm/internal.h
@@ -208,11 +208,6 @@ extern char * const zone_names[MAX_NR_ZO
/* perform sanity checks on struct pages being allocated or freed */
DECLARE_STATIC_KEY_MAYBE(CONFIG_DEBUG_VM, check_pages_enabled);
-static inline bool is_check_pages_enabled(void)
-{
- return static_branch_unlikely(&check_pages_enabled);
-}
-
extern int min_free_kbytes;
void setup_per_zone_wmarks(void);
--- a/mm/page_alloc.c~mm-page_alloc-move-is_check_pages_enabled-into-page_allocc
+++ a/mm/page_alloc.c
@@ -983,6 +983,11 @@ static inline bool free_page_is_bad(stru
return true;
}
+static inline bool is_check_pages_enabled(void)
+{
+ return static_branch_unlikely(&check_pages_enabled);
+}
+
static int free_tail_page_prepare(struct page *head_page, struct page *page)
{
struct folio *folio = (struct folio *)head_page;
@@ -994,7 +999,7 @@ static int free_tail_page_prepare(struct
*/
BUILD_BUG_ON((unsigned long)LIST_POISON1 & 1);
- if (!static_branch_unlikely(&check_pages_enabled)) {
+ if (!is_check_pages_enabled()) {
ret = 0;
goto out;
}
_
Patches currently in -mm which might be from wangkefeng.wang@xxxxxxxxxx are
