Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BE7FE346AFA for ; Mon, 5 Jan 2026 19:28:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767641308; cv=none; b=WXGo8BlEffpDCYhsPd0yRZxXLM9oRVMDa8dqYy7mEKw4JLp3ZLWKSQoyiWvFrmPXmvhr7NF4he4f3xL+wONbFUiSig+9ebi1JyEUUyJkjZrQ7Ems/qsvfFMqUoJTqReibqi02lSqHzVk5QUI8sAeNBm4qjDdJBT7O8HdCte7Jgk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767641308; c=relaxed/simple; bh=1X2STpiF2yAkIYk3RogWoPGq5ygILhYV9EfuuhYi22s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Xfb3kej1GKyGH2uv9lAkC8pI7DuEAtrsEZ2vRMdtbYMnUwKnGWBJIuakazDYIh1hs9n719lFOjaRQbi6s6jHKBmmCosmZpZ/BWP23oMNCP+s1etnWSywkmjH9xnQbOXyO0Z3NoPjCwVNsBTRu+xcUusVjUCerCCl8UHUHy8fiBU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=QSEBm8Ex; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="QSEBm8Ex" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9CCB5C116D0; Mon, 5 Jan 2026 19:28:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1767641308; bh=1X2STpiF2yAkIYk3RogWoPGq5ygILhYV9EfuuhYi22s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QSEBm8ExCF3IyO2BxyiL6CH2I7doUVR8ZgxnAXdCEVYjVh4RqYZqZgNBukTFcOlLW mbgOzFvXy/vWJ8kQk6gVLTjHG05OmYmBB+fDnER6ox31IModO5X9ULa4hFkX3/NB2Q SARCOap2wIb+YRdCX3ZhzO1H7QQT3myANgMn0PzQdyGFBwZBCkyfvhzA5tPyyxxBjt L3zIZIo1mY5LpJFQLMNbmFpoNdGx/UKcAXWL+cCqg3RDahH4pbzirqk2SgHFlGb9/0 A8RXt3iKybsVtxbPb1ZgQ/sNOR/fpe7tIjnwIZjFFmLkXj5xRWWRjTrBruVvjrPk1L THcqNBx5KsRbw== From: Sasha Levin To: stable@vger.kernel.org Cc: Miaohe Lin , "Michael S. Tsirkin" , Muchun Song , Sasha Levin Subject: [PATCH 5.15.y 1/4] mm/balloon_compaction: make balloon page compaction callbacks static Date: Mon, 5 Jan 2026 14:28:23 -0500 Message-ID: <20260105192826.2740369-1-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <2026010548-impulse-unspoken-ac63@gregkh> References: <2026010548-impulse-unspoken-ac63@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Miaohe Lin [ Upstream commit 504c1cabe325df65c18ef38365ddd1a41c6b591b ] 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. Signed-off-by: Miaohe Lin Link: https://lore.kernel.org/r/20220125132221.2220-1-linmiaohe@huawei.com Signed-off-by: Michael S. Tsirkin Reviewed-by: Muchun Song Stable-dep-of: 0da2ba35c0d5 ("powerpc/pseries/cmm: adjust BALLOON_MIGRATE when migrating pages") Signed-off-by: Sasha Levin --- include/linux/balloon_compaction.h | 22 ---------------------- mm/balloon_compaction.c | 6 +++--- 2 files changed, 3 insertions(+), 25 deletions(-) diff --git a/include/linux/balloon_compaction.h b/include/linux/balloon_compaction.h index 338aa27e4773..edb7f6d41faa 100644 --- a/include/linux/balloon_compaction.h +++ b/include/linux/balloon_compaction.h @@ -80,12 +80,6 @@ static inline void balloon_devinfo_init(struct balloon_dev_info *balloon) #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(struct page *page) 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; diff --git a/mm/balloon_compaction.c b/mm/balloon_compaction.c index 907fefde2572..4b8eab4b3f45 100644 --- a/mm/balloon_compaction.c +++ b/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 *page, isolate_mode_t mode) 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 *page) /* 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) { -- 2.51.0