The quilt patch titled
Subject: mm/highmem: make nr_free_highpages() return "unsigned long"
has been removed from the -mm tree. Its filename was
mm-highmem-make-nr_free_highpages-return-unsigned-long.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: David Hildenbrand <david@xxxxxxxxxx>
Subject: mm/highmem: make nr_free_highpages() return "unsigned long"
Date: Fri, 7 Jun 2024 10:37:11 +0200
It looks rather weird that totalhigh_pages() returns an "unsigned long"
but nr_free_highpages() returns an "unsigned int".
Let's return an "unsigned long" from nr_free_highpages() to be consistent.
While at it, use a plain "0" instead of a "0UL" in the !CONFIG_HIGHMEM
totalhigh_pages() implementation, to make these look alike as well.
Link: https://lkml.kernel.org/r/20240607083711.62833-3-david@xxxxxxxxxx
Signed-off-by: David Hildenbrand <david@xxxxxxxxxx>
Reviewed-by: Wei Yang <richard.weiyang@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/highmem-internal.h | 8 ++++----
include/linux/highmem.h | 2 +-
mm/highmem.c | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
--- a/include/linux/highmem.h~mm-highmem-make-nr_free_highpages-return-unsigned-long
+++ a/include/linux/highmem.h
@@ -179,7 +179,7 @@ static inline void *kmap_local_folio(str
static inline void *kmap_atomic(struct page *page);
/* Highmem related interfaces for management code */
-static inline unsigned int nr_free_highpages(void);
+static inline unsigned long nr_free_highpages(void);
static inline unsigned long totalhigh_pages(void);
#ifndef ARCH_HAS_FLUSH_ANON_PAGE
--- a/include/linux/highmem-internal.h~mm-highmem-make-nr_free_highpages-return-unsigned-long
+++ a/include/linux/highmem-internal.h
@@ -131,10 +131,10 @@ static inline void __kunmap_atomic(const
preempt_enable();
}
-unsigned int __nr_free_highpages(void);
+unsigned long __nr_free_highpages(void);
unsigned long __totalhigh_pages(void);
-static inline unsigned int nr_free_highpages(void)
+static inline unsigned long nr_free_highpages(void)
{
return __nr_free_highpages();
}
@@ -234,8 +234,8 @@ static inline void __kunmap_atomic(const
preempt_enable();
}
-static inline unsigned int nr_free_highpages(void) { return 0; }
-static inline unsigned long totalhigh_pages(void) { return 0UL; }
+static inline unsigned long nr_free_highpages(void) { return 0; }
+static inline unsigned long totalhigh_pages(void) { return 0; }
static inline bool is_kmap_addr(const void *x)
{
--- a/mm/highmem.c~mm-highmem-make-nr_free_highpages-return-unsigned-long
+++ a/mm/highmem.c
@@ -111,10 +111,10 @@ static inline wait_queue_head_t *get_pkm
}
#endif
-unsigned int __nr_free_highpages(void)
+unsigned long __nr_free_highpages(void)
{
+ unsigned long pages = 0;
struct zone *zone;
- unsigned int pages = 0;
for_each_populated_zone(zone) {
if (is_highmem(zone))
_
Patches currently in -mm which might be from david@xxxxxxxxxx are
mm-pass-meminit_context-to-__free_pages_core.patch
mm-pass-meminit_context-to-__free_pages_core-fix.patch
mm-pass-meminit_context-to-__free_pages_core-fix-2.patch
mm-pass-meminit_context-to-__free_pages_core-fix-3.patch
mm-memory_hotplug-initialize-memmap-of-zone_device-with-pageoffline-instead-of-pagereserved.patch
mm-memory_hotplug-skip-adjust_managed_page_count-for-pageoffline-pages-when-offlining.patch
mm-read-page_type-using-read_once.patch
mm-migrate-make-migrate_misplaced_folio-return-0-on-success.patch
mm-migrate-move-numa-hinting-fault-folio-isolation-checks-under-ptl.patch
