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 D1617C433FE for ; Wed, 19 Oct 2022 11:46:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231482AbiJSLq2 (ORCPT ); Wed, 19 Oct 2022 07:46:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41618 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229906AbiJSLqH (ORCPT ); Wed, 19 Oct 2022 07:46:07 -0400 Received: from relay.virtuozzo.com (relay.virtuozzo.com [130.117.225.111]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C3667169126 for ; Wed, 19 Oct 2022 04:25:51 -0700 (PDT) Received: from dev011.ch-qa.sw.ru ([172.29.1.16]) by relay.virtuozzo.com with esmtp (Exim 4.95) (envelope-from ) id 1ol5lY-00B8K8-H0; Wed, 19 Oct 2022 11:56:27 +0200 From: Alexander Atanasov To: Michael Ellerman , Nicholas Piggin , Christophe Leroy , Nadav Amit , VMware PV-Drivers Reviewers , Arnd Bergmann , Greg Kroah-Hartman , "Michael S. Tsirkin" , David Hildenbrand , Jason Wang , Andrew Morton Cc: kernel@openvz.org, Alexander Atanasov , linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, virtualization@lists.linux-foundation.org, linux-mm@kvack.org Subject: [RFC PATCH v5 1/8] mm: Make a place for a common balloon code Date: Wed, 19 Oct 2022 12:56:13 +0300 Message-Id: <20221019095620.124909-2-alexander.atanasov@virtuozzo.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20221019095620.124909-1-alexander.atanasov@virtuozzo.com> References: <20221019095620.124909-1-alexander.atanasov@virtuozzo.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The file already contains code that is common along balloon drivers so rename it to reflect its contents. mm/balloon_compaction.c -> mm/balloon.c include/linux/balloon_compaction.h -> include/linux/balloon.h Remove it from files that do not actually use it. Drop externs from function declarations. Signed-off-by: Alexander Atanasov Acked-by: Nadav Amit --- MAINTAINERS | 4 ++-- arch/powerpc/platforms/pseries/cmm.c | 2 +- drivers/misc/vmw_balloon.c | 2 +- drivers/virtio/virtio_balloon.c | 2 +- include/linux/{balloon_compaction.h => balloon.h} | 12 +++++------- mm/Makefile | 2 +- mm/{balloon_compaction.c => balloon.c} | 4 +--- mm/migrate.c | 1 - mm/vmscan.c | 1 - 9 files changed, 12 insertions(+), 18 deletions(-) rename include/linux/{balloon_compaction.h => balloon.h} (93%) rename mm/{balloon_compaction.c => balloon.c} (99%) diff --git a/MAINTAINERS b/MAINTAINERS index cf0f18502372..3f5a4e409562 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -21744,8 +21744,8 @@ L: virtualization@lists.linux-foundation.org S: Maintained F: drivers/virtio/virtio_balloon.c F: include/uapi/linux/virtio_balloon.h -F: include/linux/balloon_compaction.h -F: mm/balloon_compaction.c +F: include/linux/balloon.h +F: mm/balloon.c VIRTIO CRYPTO DRIVER M: Gonglei diff --git a/arch/powerpc/platforms/pseries/cmm.c b/arch/powerpc/platforms/pseries/cmm.c index 5f4037c1d7fe..1d40f6416d6a 100644 --- a/arch/powerpc/platforms/pseries/cmm.c +++ b/arch/powerpc/platforms/pseries/cmm.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/misc/vmw_balloon.c b/drivers/misc/vmw_balloon.c index 61a2be712bf7..91d4d2a285c5 100644 --- a/drivers/misc/vmw_balloon.c +++ b/drivers/misc/vmw_balloon.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c index 3f78a3a1eb75..d0c27c680721 100644 --- a/drivers/virtio/virtio_balloon.c +++ b/drivers/virtio/virtio_balloon.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/include/linux/balloon_compaction.h b/include/linux/balloon.h similarity index 93% rename from include/linux/balloon_compaction.h rename to include/linux/balloon.h index 5ca2d5699620..46ac8f61f607 100644 --- a/include/linux/balloon_compaction.h +++ b/include/linux/balloon.h @@ -1,7 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0 */ /* - * include/linux/balloon_compaction.h - * * Common interface definitions for making balloon pages movable by compaction. * * Balloon page migration makes use of the general non-lru movable page @@ -59,13 +57,13 @@ struct balloon_dev_info { struct page *page, enum migrate_mode mode); }; -extern struct page *balloon_page_alloc(void); -extern void balloon_page_enqueue(struct balloon_dev_info *b_dev_info, +struct page *balloon_page_alloc(void); +void balloon_page_enqueue(struct balloon_dev_info *b_dev_info, struct page *page); -extern struct page *balloon_page_dequeue(struct balloon_dev_info *b_dev_info); -extern size_t balloon_page_list_enqueue(struct balloon_dev_info *b_dev_info, +struct page *balloon_page_dequeue(struct balloon_dev_info *b_dev_info); +size_t balloon_page_list_enqueue(struct balloon_dev_info *b_dev_info, struct list_head *pages); -extern size_t balloon_page_list_dequeue(struct balloon_dev_info *b_dev_info, +size_t balloon_page_list_dequeue(struct balloon_dev_info *b_dev_info, struct list_head *pages, size_t n_req_pages); static inline void balloon_devinfo_init(struct balloon_dev_info *balloon) diff --git a/mm/Makefile b/mm/Makefile index 8e105e5b3e29..f73a9b200c91 100644 --- a/mm/Makefile +++ b/mm/Makefile @@ -116,7 +116,7 @@ obj-$(CONFIG_ZSMALLOC) += zsmalloc.o obj-$(CONFIG_Z3FOLD) += z3fold.o obj-$(CONFIG_GENERIC_EARLY_IOREMAP) += early_ioremap.o obj-$(CONFIG_CMA) += cma.o -obj-$(CONFIG_MEMORY_BALLOON) += balloon_compaction.o +obj-$(CONFIG_MEMORY_BALLOON) += balloon.o obj-$(CONFIG_PAGE_EXTENSION) += page_ext.o obj-$(CONFIG_PAGE_TABLE_CHECK) += page_table_check.o obj-$(CONFIG_CMA_DEBUGFS) += cma_debug.o diff --git a/mm/balloon_compaction.c b/mm/balloon.c similarity index 99% rename from mm/balloon_compaction.c rename to mm/balloon.c index 22c96fed70b5..22b3e876bc78 100644 --- a/mm/balloon_compaction.c +++ b/mm/balloon.c @@ -1,7 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * mm/balloon_compaction.c - * * Common interface for making balloon pages movable by compaction. * * Copyright (C) 2012, Red Hat, Inc. Rafael Aquini @@ -9,7 +7,7 @@ #include #include #include -#include +#include static void balloon_page_enqueue_one(struct balloon_dev_info *b_dev_info, struct page *page) diff --git a/mm/migrate.c b/mm/migrate.c index 1379e1912772..74c21b1cb2ec 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -41,7 +41,6 @@ #include #include #include -#include #include #include #include diff --git a/mm/vmscan.c b/mm/vmscan.c index 04d8b88e5216..5a4e17bf4193 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -59,7 +59,6 @@ #include #include -#include #include #include "internal.h" -- 2.31.1