From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5CEB9C433EF for ; Mon, 7 Mar 2022 22:30:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241280AbiCGWbs (ORCPT ); Mon, 7 Mar 2022 17:31:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39330 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241119AbiCGWbs (ORCPT ); Mon, 7 Mar 2022 17:31:48 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 46DAF2DA93 for ; Mon, 7 Mar 2022 14:30:53 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id CF0D161157 for ; Mon, 7 Mar 2022 22:30:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1205BC340E9; Mon, 7 Mar 2022 22:30:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1646692252; bh=ICP4wS8ZV5w/nYELlTG5tJqep2mdiwcCvBa1Up2gxJc=; h=Date:To:From:Subject:From; b=wJLE6LoeSdvqej6643j1mVVkmjFodfGh7CeoJSTrJXehsRHwwFnae4iKkhTgY+qSc MZQIKo+d78xhhUva/t/ZTXwu85F9h7fhpSpbOoE0ib0Zyidcp7KuGpoCGsjX2NDZhu FsUn11sPsHLOI74j/55iu4BIYKcDxZ2bLUpWBAzs= Date: Mon, 07 Mar 2022 14:30:51 -0800 To: mm-commits@vger.kernel.org, songmuchun@bytedance.com, mst@redhat.com, david@redhat.com, aquini@redhat.com, linmiaohe@huawei.com, akpm@linux-foundation.org From: Andrew Morton Subject: [merged] mm-balloon_compaction-make-balloon-page-compaction-callbacks-static.patch removed from -mm tree Message-Id: <20220307223052.1205BC340E9@smtp.kernel.org> Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The patch titled Subject: mm/balloon_compaction: make balloon page compaction callbacks static has been removed from the -mm tree. Its filename was mm-balloon_compaction-make-balloon-page-compaction-callbacks-static.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Miaohe Lin Subject: mm/balloon_compaction: make balloon page compaction callbacks static Since commit b1123ea6d3b3 ("mm: balloon: use general non-lru movable page feature"), these functions are called via balloon_aops callbacks. They're not called directly outside this file. So make them static and clean up the relevant code. Link: https://lkml.kernel.org/r/20220125132221.2220-1-linmiaohe@huawei.com Signed-off-by: Miaohe Lin Reviewed-by: David Hildenbrand Reviewed-by: Muchun Song Acked-by: Rafael Aquini Acked-by: Michael S. Tsirkin Signed-off-by: Andrew Morton --- include/linux/balloon_compaction.h | 22 ---------------------- mm/balloon_compaction.c | 6 +++--- 2 files changed, 3 insertions(+), 25 deletions(-) --- a/include/linux/balloon_compaction.h~mm-balloon_compaction-make-balloon-page-compaction-callbacks-static +++ a/include/linux/balloon_compaction.h @@ -80,12 +80,6 @@ static inline void balloon_devinfo_init( #ifdef CONFIG_BALLOON_COMPACTION extern const struct address_space_operations balloon_aops; -extern bool balloon_page_isolate(struct page *page, - isolate_mode_t mode); -extern void balloon_page_putback(struct page *page); -extern int balloon_page_migrate(struct address_space *mapping, - struct page *newpage, - struct page *page, enum migrate_mode mode); /* * balloon_page_insert - insert a page into the balloon's page list and make @@ -155,22 +149,6 @@ static inline void balloon_page_delete(s list_del(&page->lru); } -static inline bool balloon_page_isolate(struct page *page) -{ - return false; -} - -static inline void balloon_page_putback(struct page *page) -{ - return; -} - -static inline int balloon_page_migrate(struct page *newpage, - struct page *page, enum migrate_mode mode) -{ - return 0; -} - static inline gfp_t balloon_mapping_gfp_mask(void) { return GFP_HIGHUSER; --- a/mm/balloon_compaction.c~mm-balloon_compaction-make-balloon-page-compaction-callbacks-static +++ a/mm/balloon_compaction.c @@ -203,7 +203,7 @@ EXPORT_SYMBOL_GPL(balloon_page_dequeue); #ifdef CONFIG_BALLOON_COMPACTION -bool balloon_page_isolate(struct page *page, isolate_mode_t mode) +static bool balloon_page_isolate(struct page *page, isolate_mode_t mode) { struct balloon_dev_info *b_dev_info = balloon_page_device(page); @@ -217,7 +217,7 @@ bool balloon_page_isolate(struct page *p return true; } -void balloon_page_putback(struct page *page) +static void balloon_page_putback(struct page *page) { struct balloon_dev_info *b_dev_info = balloon_page_device(page); unsigned long flags; @@ -230,7 +230,7 @@ void balloon_page_putback(struct page *p /* move_to_new_page() counterpart for a ballooned page */ -int balloon_page_migrate(struct address_space *mapping, +static int balloon_page_migrate(struct address_space *mapping, struct page *newpage, struct page *page, enum migrate_mode mode) { _ Patches currently in -mm which might be from linmiaohe@huawei.com are mm-memremap-avoid-calling-kasan_remove_zero_shadow-for-device-private-memory.patch filemap-remove-find_get_pages.patch mm-writeback-minor-clean-up-for-highmem_dirtyable_memory.patch mm-use-helper-function-range_in_vma.patch mm-use-helper-macro-min-and-max-in-unmap_mapping_range_tree.patch mm-sparse-make-mminit_validate_memmodel_limits-static.patch mm-vmalloc-remove-unneeded-function-forward-declaration.patch mm-mmzoneh-remove-unused-macros.patch mm-memory-failurec-minor-clean-up-for-memory_failure_dev_pagemap.patch mm-memory-failurec-catch-unexpected-efault-from-vma_address.patch mm-memory-failurec-rework-the-signaling-logic-in-kill_proc.patch mm-memory-failurec-fix-race-with-changing-page-more-robustly.patch mm-memory-failurec-remove-pageslab-check-in-hwpoison_filter_dev.patch mm-memory-failurec-rework-the-try_to_unmap-logic-in-hwpoison_user_mappings.patch mm-memory-failurec-remove-obsolete-comment-in-__soft_offline_page.patch mm-memory-failurec-remove-unnecessary-pagetranstail-check.patch mm-hwpoison-inject-support-injecting-hwpoison-to-free-page.patch mm-hugetlb-use-helper-macro-__attr_rw.patch mm-oom_kill-remove-unneeded-is_memcg_oom-check.patch mm-ksm-use-helper-macro-__attr_rw.patch mm-memory_hotplug-remove-obsolete-comment-of-__add_pages.patch mm-memory_hotplug-avoid-calling-zone_intersects-for-zone_normal.patch mm-memory_hotplug-clean-up-try_offline_node.patch mm-memory_hotplug-fix-misplaced-comment-in-offline_pages.patch mm-highmem-remove-unnecessary-done-label.patch mm-hmmc-remove-unneeded-local-variable-ret.patch kernel-ksysfsc-use-helper-macro-__attr_rw.patch kernel-resource-fix-kfree-of-bootmem-memory-again.patch mm-huge_memory-make-is_transparent_hugepage-static.patch