On 1/26/21 11:51 PM, David Hildenbrand wrote:

This function is never used and it is one of the last remaining user of __free_reserved_page(). Let's just drop it.

Cc: Andrew Morton akpm@linux-foundation.org Cc: Thomas Gleixner tglx@linutronix.de Cc: "Peter Zijlstra (Intel)" peterz@infradead.org Cc: Mike Rapoport rppt@kernel.org Cc: Oscar Salvador osalvador@suse.de Cc: Michal Hocko mhocko@kernel.org Cc: Wei Yang richard.weiyang@linux.alibaba.com Cc: "Gustavo A. R. Silva" gustavoars@kernel.org Cc: Sam Ravnborg sam@ravnborg.org Signed-off-by: David Hildenbrand david@redhat.com

There is no other reference for free_unused_pages() in the tree.

Reviewed-by: Anshuman Khandual anshuman.khandual@arm.com

---

drivers/video/fbdev/acornfb.c | 34 ---------------------------------- 1 file changed, 34 deletions(-)

diff --git a/drivers/video/fbdev/acornfb.c b/drivers/video/fbdev/acornfb.c index bcc92aecf666..1b72edc01cfb 100644 --- a/drivers/video/fbdev/acornfb.c +++ b/drivers/video/fbdev/acornfb.c @@ -921,40 +921,6 @@ static int acornfb_detect_monitortype(void) return 4; }

-/*

• • This enables the unused memory to be freed on older Acorn machines.
• • We are freeing memory on behalf of the architecture initialisation
• • code here.
• */

-static inline void -free_unused_pages(unsigned int virtual_start, unsigned int virtual_end) -{

• int mb_freed = 0;
• /*

• * Align addresses
  

• */
  

• virtual_start = PAGE_ALIGN(virtual_start);
• virtual_end = PAGE_ALIGN(virtual_end);
• while (virtual_start < virtual_end) {

• struct page *page;
  

• /*
  

•  * Clear page reserved bit,
  

•  * set count to 1, and free
  

•  * the page.
  

•  */
  

• page = virt_to_page(virtual_start);
  

• __free_reserved_page(page);
  

• virtual_start += PAGE_SIZE;
  

• mb_freed += PAGE_SIZE / 1024;
  

• }
• printk("acornfb: freed %dK memory\n", mb_freed);

-}

static int acornfb_probe(struct platform_device *dev) { unsigned long size;

On 1/26/21 11:51 PM, David Hildenbrand wrote:

adjust_managed_page_count() as called by free_reserved_page() properly handles pages in a highmem zone, so we can reuse it for free_highmem_page().

We can now get rid of totalhigh_pages_inc() and simplify free_reserved_page().

Cc: Andrew Morton akpm@linux-foundation.org Cc: Thomas Gleixner tglx@linutronix.de Cc: "Peter Zijlstra (Intel)" peterz@infradead.org Cc: Mike Rapoport rppt@kernel.org Cc: Oscar Salvador osalvador@suse.de Cc: Michal Hocko mhocko@kernel.org Cc: Wei Yang richard.weiyang@linux.alibaba.com Signed-off-by: David Hildenbrand david@redhat.com

Reviewed-by: Anshuman Khandual anshuman.khandual@arm.com

---

include/linux/highmem-internal.h | 5 ----- include/linux/mm.h | 16 ++-------------- mm/page_alloc.c | 11 ----------- 3 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/include/linux/highmem-internal.h b/include/linux/highmem-internal.h index 1bbe96dc8be6..7902c7d8b55f 100644 --- a/include/linux/highmem-internal.h +++ b/include/linux/highmem-internal.h @@ -127,11 +127,6 @@ static inline unsigned long totalhigh_pages(void) return (unsigned long)atomic_long_read(&_totalhigh_pages); }

-static inline void totalhigh_pages_inc(void) -{

• atomic_long_inc(&_totalhigh_pages);

-}

static inline void totalhigh_pages_add(long count) { atomic_long_add(count, &_totalhigh_pages); diff --git a/include/linux/mm.h b/include/linux/mm.h index a5d618d08506..494c69433a34 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2303,32 +2303,20 @@ extern void free_initmem(void); extern unsigned long free_reserved_area(void *start, void *end, int poison, const char *s);

-#ifdef CONFIG_HIGHMEM -/*

• • Free a highmem page into the buddy system, adjusting totalhigh_pages
• • and totalram_pages.
• */

-extern void free_highmem_page(struct page *page); -#endif

extern void adjust_managed_page_count(struct page *page, long count); extern void mem_init_print_info(const char *str);

extern void reserve_bootmem_region(phys_addr_t start, phys_addr_t end);

/* Free the reserved page into the buddy system, so it gets managed. */ -static inline void __free_reserved_page(struct page *page) +static inline void free_reserved_page(struct page *page) { ClearPageReserved(page); init_page_count(page); __free_page(page); -}

-static inline void free_reserved_page(struct page *page) -{

• __free_reserved_page(page); adjust_managed_page_count(page, 1);

} +#define free_highmem_page(page) free_reserved_page(page)

static inline void mark_page_reserved(struct page *page) { diff --git a/mm/page_alloc.c b/mm/page_alloc.c index b031a5ae0bd5..b2e42f10d4d4 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -7711,17 +7711,6 @@ unsigned long free_reserved_area(void *start, void *end, int poison, const char return pages; }

-#ifdef CONFIG_HIGHMEM -void free_highmem_page(struct page *page) -{

• __free_reserved_page(page);
• totalram_pages_inc();
• atomic_long_inc(&page_zone(page)->managed_pages);
• totalhigh_pages_inc();

-} -#endif

void __init mem_init_print_info(const char *str) { unsigned long physpages, codesize, datasize, rosize, bss_size;