Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 09330C433E0 for ; Thu, 25 Feb 2021 19:31:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A6BC264F1A for ; Thu, 25 Feb 2021 19:31:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234477AbhBYTal (ORCPT ); Thu, 25 Feb 2021 14:30:41 -0500 Received: from mail.kernel.org ([198.145.29.99]:36922 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234548AbhBYT16 (ORCPT ); Thu, 25 Feb 2021 14:27:58 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 982D064F96; Thu, 25 Feb 2021 19:16:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1614280582; bh=ls+mBQvu0NcbU/ZcPnDMk0n17B4DPlrbUawd71L37Gg=; h=Date:From:To:Subject:From; b=EdQbSmUVhkrSd/JvHqj7HbCkr0+DHfhrFqLh9WOPvfX2haGBlf8iqGYbQY40GvHRN kTZaLRxkU3NpyxWt4a95ZKeEtIFCll5WLMgYOOzWwC3znDie/fcMJf1dXUQt277nBI Cpl8WciNQhsusdznykxXLIb/YdpPPM0Z6c/liiYw= Date: Thu, 25 Feb 2021 11:16:21 -0800 From: akpm@linux-foundation.org To: anshuman.khandual@arm.com, david@redhat.com, gustavoars@kernel.org, mhocko@kernel.org, mm-commits@vger.kernel.org, osalvador@suse.de, peterz@infradead.org, richard.weiyang@linux.alibaba.com, rppt@kernel.org, sam@ravnborg.org, tglx@linutronix.de Subject: [merged] mm-simplify-free_highmem_page-and-free_reserved_page.patch removed from -mm tree Message-ID: <20210225191621.8dan5M2l4%akpm@linux-foundation.org> User-Agent: s-nail v14.8.16 Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org 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 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(). Link: https://lkml.kernel.org/r/20210126182113.19892-3-david@redhat.com Signed-off-by: David Hildenbrand Reviewed-by: Oscar Salvador Reviewed-by: Anshuman Khandual Cc: Thomas Gleixner Cc: "Peter Zijlstra (Intel)" Cc: Mike Rapoport Cc: Michal Hocko Cc: Wei Yang Cc: "Gustavo A. R. Silva" Cc: Sam Ravnborg Signed-off-by: Andrew Morton --- include/linux/highmem-internal.h | 5 ----- include/linux/mm.h | 16 ++-------------- mm/page_alloc.c | 11 ----------- 3 files changed, 2 insertions(+), 30 deletions(-) --- a/include/linux/highmem-internal.h~mm-simplify-free_highmem_page-and-free_reserved_page +++ a/include/linux/highmem-internal.h @@ -127,11 +127,6 @@ static inline unsigned long totalhigh_pa 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); --- a/include/linux/mm.h~mm-simplify-free_highmem_page-and-free_reserved_page +++ a/include/linux/mm.h @@ -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) { --- a/mm/page_alloc.c~mm-simplify-free_highmem_page-and-free_reserved_page +++ a/mm/page_alloc.c @@ -7691,17 +7691,6 @@ unsigned long free_reserved_area(void *s 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; _ Patches currently in -mm which might be from david@redhat.com 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