* [merged mm-stable] mm-page_alloc-fix-build-with-config_unaccepted_memory=n.patch removed from -mm tree
@ 2024-09-09 23:41 Andrew Morton
0 siblings, 0 replies; only message in thread
From: Andrew Morton @ 2024-09-09 23:41 UTC (permalink / raw)
To: mm-commits, andriy.shevchenko, akpm, akpm
The quilt patch titled
Subject: mm/page_alloc: fix build with CONFIG_UNACCEPTED_MEMORY=n
has been removed from the -mm tree. Its filename was
mm-page_alloc-fix-build-with-config_unaccepted_memory=n.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: Andrew Morton <akpm@linux-foundation.org>
Subject: mm/page_alloc: fix build with CONFIG_UNACCEPTED_MEMORY=n
Date: Thu, 5 Sep 2024 14:22:20 -0700
When has_unaccepted_memory() is unused, it prevents kernel builds
with clang, `make W=1` and CONFIG_WERROR=y:
mm/page_alloc.c:7036:20: error: unused function 'has_unaccepted_memory' [-Werror,-Wunused-function]
7036 | static inline bool has_unaccepted_memory(void)
| ^~~~~~~~~~~~~~~~~~~~~
Fix it by removeing the CONFIG_UNACCEPTED_MEMORY=n stub.
Link: https://lkml.kernel.org/r/20240905142220.49d93337a0abce5690e515d9@linux-foundation.org
Reported-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Closes: https://lkml.kernel.org/r/20240905171553.275054-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
mm/page_alloc.c | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
--- a/mm/page_alloc.c~mm-page_alloc-fix-build-with-config_unaccepted_memory=n
+++ a/mm/page_alloc.c
@@ -287,7 +287,6 @@ EXPORT_SYMBOL(nr_online_nodes);
static bool page_contains_unaccepted(struct page *page, unsigned int order);
static bool cond_accept_memory(struct zone *zone, unsigned int order);
-static inline bool has_unaccepted_memory(void);
static bool __free_unaccepted(struct page *page);
int page_group_by_mobility_disabled __read_mostly;
@@ -7061,6 +7060,11 @@ static bool try_to_accept_memory_one(str
return true;
}
+static inline bool has_unaccepted_memory(void)
+{
+ return static_branch_unlikely(&zones_with_unaccepted_pages);
+}
+
static bool cond_accept_memory(struct zone *zone, unsigned int order)
{
long to_accept;
@@ -7088,11 +7092,6 @@ static bool cond_accept_memory(struct zo
return ret;
}
-static inline bool has_unaccepted_memory(void)
-{
- return static_branch_unlikely(&zones_with_unaccepted_pages);
-}
-
static bool __free_unaccepted(struct page *page)
{
struct zone *zone = page_zone(page);
@@ -7127,11 +7126,6 @@ static bool cond_accept_memory(struct zo
{
return false;
}
-
-static inline bool has_unaccepted_memory(void)
-{
- return false;
-}
static bool __free_unaccepted(struct page *page)
{
_
Patches currently in -mm which might be from akpm@linux-foundation.org are
mm-vma-return-the-exact-errno-in-vms_gather_munmap_vmas-fix.patch
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2024-09-09 23:41 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-09 23:41 [merged mm-stable] mm-page_alloc-fix-build-with-config_unaccepted_memory=n.patch removed from -mm tree Andrew Morton
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.