kevin/linux
1
Fork 0
Code

mm/highmem: make nr_free_highpages() return "unsigned long"

Browse Source 
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@redhat.com
Signed-off-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Wei Yang <richard.weiyang@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
David Hildenbrand 2024-06-07 10:37:11 +02:00 committed by Andrew Morton
parent 7a581204b1
commit 90b8fab5cd
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/linux/highmem-internal.h
View File

@ -131,10 +131,10 @@ static inline void __kunmap_atomic(const void *addr)
preempt_enable(); preempt_enable();
} }
unsigned int __nr_free_highpages(void); unsigned long __nr_free_highpages(void);
unsigned long __totalhigh_pages(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(); return __nr_free_highpages();
} }
@ -234,8 +234,8 @@ static inline void __kunmap_atomic(const void *addr)
preempt_enable(); preempt_enable();
} }
static inline unsigned int nr_free_highpages(void) { return 0; } static inline unsigned long nr_free_highpages(void) { return 0; }
static inline unsigned long totalhigh_pages(void) { return 0UL; } static inline unsigned long totalhigh_pages(void) { return 0; }
static inline bool is_kmap_addr(const void *x) static inline bool is_kmap_addr(const void *x)
{ {

2
include/linux/highmem.h
View File

@ -179,7 +179,7 @@ static inline void *kmap_local_folio(struct folio *folio, size_t offset);
static inline void *kmap_atomic(struct page *page); static inline void *kmap_atomic(struct page *page);
/* Highmem related interfaces for management code */ /* 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); static inline unsigned long totalhigh_pages(void);
#ifndef ARCH_HAS_FLUSH_ANON_PAGE #ifndef ARCH_HAS_FLUSH_ANON_PAGE

4
mm/highmem.c
View File

@ -111,10 +111,10 @@ static inline wait_queue_head_t *get_pkmap_wait_queue_head(unsigned int color)
} }
#endif #endif
unsigned int __nr_free_highpages(void) unsigned long __nr_free_highpages(void)
{ {
unsigned long pages = 0;
struct zone *zone; struct zone *zone;
unsigned int pages = 0;
for_each_populated_zone(zone) { for_each_populated_zone(zone) {
if (is_highmem(zone)) if (is_highmem(zone))