mm-simplify-free_highmem_page-and-free_reserved_page.patch removed from -mm tree
The patch titled
Subject: mm: simplify free_highmem_page() and free_reserved_page()
has been removed from the -mm tree. Its filename was
mm-simplify-free_highmem_page-and-free_reserved_page.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: David Hildenbrand <[email protected]>
Subject: mm: simplify free_highmem_page() and free_reserved_page()
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().
---
include/linux/highmem-internal.h | 5 ----- include/linux/mm.h | 16 ++-------------- mm/page_alloc.c | 11 ----------- 3 files changed, 2 insertions(+), 30 deletions(-)
include/linux/highmem-internal.h renamed from include/linux/highmem-internal.h~mm-simplify-free_highmem_page-and-free_reserved_page +0 -5
@@ -127,11 +127,6 @@ static inline unsigned long totalhigh_pareturn (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);
include/linux/mm.h renamed from include/linux/mm.h~mm-simplify-free_highmem_page-and-free_reserved_page +2 -14
@@ -2310,32 +2310,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) {
mm/page_alloc.c renamed from mm/page_alloc.c~mm-simplify-free_highmem_page-and-free_reserved_page +0 -11
@@ -7691,17 +7691,6 @@ unsigned long free_reserved_area(void *sreturn 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;
_
Patches currently in -mm which might be from [email protected] are
mm-cma-expose-all-pages-to-the-buddy-if-activation-of-an-area-fails.patch mm-page_alloc-count-cma-pages-per-zone-and-print-them-in-proc-zoneinfo.patch mm-page_alloc-count-cma-pages-per-zone-and-print-them-in-proc-zoneinfo-v2.patch mm-page_alloc-count-cma-pages-per-zone-and-print-them-in-proc-zoneinfo-v3.patch mm-memory_hotplug-memhp_merge_resource-mhp_merge_resource.patch drivers-base-memory-dont-store-phys_device-in-memory-blocks.patch documentation-sysfs-memory-clarify-some-memory-block-device-properties.patch virtio-mem-check-against-mhp_get_pluggable_range-which-memory-we-can-hotplug.patch