mm: rename CONFIG_MEMORY_BALLOON -> CONFIG_BALLOON

Let's make it consistent with the naming of the files but also with the
naming of CONFIG_BALLOON_MIGRATION.

While at it, add a "/* CONFIG_BALLOON */".

Link: https://lkml.kernel.org/r/20260119230133.3551867-24-david@kernel.org
Signed-off-by: David Hildenbrand (Red Hat) <david@kernel.org>
Reviewed-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Eugenio Pérez <eperezma@redhat.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jason Wang <jasowang@redhat.com>
Cc: Jerrin Shaji George <jerrin.shaji-george@broadcom.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Liam Howlett <liam.howlett@oracle.com>
Cc: Madhavan Srinivasan <maddy@linux.ibm.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Mike Rapoport <rppt@kernel.org>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Oscar Salvador <osalvador@suse.de>
Cc: SeongJae Park <sj@kernel.org>
Cc: Suren Baghdasaryan <surenb@google.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
Cc: Zi Yan <ziy@nvidia.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/arch/powerpc/platforms/pseries/Kconfig b/arch/powerpc/platforms/pseries/Kconfig
index 3e042218d6cd8c89e282f7b673f50ee47062a0f4..f7052b131a4c5e342b455d12cb41a62c1dc3a743 100644 (file)
--- a/arch/powerpc/platforms/pseries/Kconfig
+++ b/arch/powerpc/platforms/pseries/Kconfig
@@ -120,7 +120,7 @@ config PPC_SMLPAR
 config CMM
        tristate "Collaborative memory management"
        depends on PPC_SMLPAR
-       select MEMORY_BALLOON
+       select BALLOON
        default y
        help
          Select this option, if you want to enable the kernel interface

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index d7d41b054b9824f341f20f09410bad1d4c1e361f..5cc79d1517af5151817e5e970761cf457db770c1 100644 (file)
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -410,7 +410,7 @@ config DS1682
 config VMWARE_BALLOON
        tristate "VMware Balloon Driver"
        depends on VMWARE_VMCI && X86 && HYPERVISOR_GUEST
-       select MEMORY_BALLOON
+       select BALLOON
        help
          This is VMware physical memory management driver which acts
          like a "balloon" that can be inflated to reclaim physical pages

diff --git a/drivers/virtio/Kconfig b/drivers/virtio/Kconfig
index 6db5235a7693d6d09caba949dfe85e6a7313f826..ce5bc0d9ea2873c04461fd28cca845be020b4ac2 100644 (file)
--- a/drivers/virtio/Kconfig
+++ b/drivers/virtio/Kconfig
@@ -112,7 +112,7 @@ config VIRTIO_PMEM
 config VIRTIO_BALLOON
        tristate "Virtio balloon driver"
        depends on VIRTIO
-       select MEMORY_BALLOON
+       select BALLOON
        select PAGE_REPORTING
        help
         This driver supports increasing and decreasing the amount

diff --git a/include/linux/vm_event_item.h b/include/linux/vm_event_item.h
index fca34d3473b6b1f4a2c69873148fdcce00769e91..22a139f82d75f59a0cfdcc4828d617262aabd27b 100644 (file)
--- a/include/linux/vm_event_item.h
+++ b/include/linux/vm_event_item.h
@@ -122,13 +122,13 @@ enum vm_event_item { PGPGIN, PGPGOUT, PSWPIN, PSWPOUT,
                THP_SWPOUT,
                THP_SWPOUT_FALLBACK,
 #endif
-#ifdef CONFIG_MEMORY_BALLOON
+#ifdef CONFIG_BALLOON
                BALLOON_INFLATE,
                BALLOON_DEFLATE,
 #ifdef CONFIG_BALLOON_MIGRATION
                BALLOON_MIGRATE,
 #endif /* CONFIG_BALLOON_MIGRATION */
-#endif
+#endif /* CONFIG_BALLOON */
 #ifdef CONFIG_DEBUG_TLBFLUSH
                NR_TLB_REMOTE_FLUSH,    /* cpu tried to flush others' tlbs */
                NR_TLB_REMOTE_FLUSH_RECEIVED,/* cpu received ipi for flush */

diff --git a/mm/Kconfig b/mm/Kconfig
index cd6896c1ba7de25472e2b62cedcf9ca43a58eafe..d1d76ce7373ed5c632800c8f5a11680b145bbc65 100644 (file)
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -593,7 +593,7 @@ config SPLIT_PMD_PTLOCKS
 
 #
 # support for memory balloon
-config MEMORY_BALLOON
+config BALLOON
        bool
 
 #
@@ -601,7 +601,7 @@ config MEMORY_BALLOON
 config BALLOON_MIGRATION
        bool "Allow for balloon memory migration"
        default y
-       depends on MIGRATION && MEMORY_BALLOON
+       depends on MIGRATION && BALLOON
        help
          Allow for migration of pages inflated in a memory balloon such that
          they can be allocated from memory areas only available for movable

diff --git a/mm/Makefile b/mm/Makefile
index 1e31e0a528dc1c12be7d6f45c7cdc2aa2ce38578..0d85b10dbdde488429500f7504755e62e2cc804c 100644 (file)
--- a/mm/Makefile
+++ b/mm/Makefile
@@ -122,7 +122,7 @@ obj-$(CONFIG_CMA)   += cma.o
 obj-$(CONFIG_NUMA) += numa.o
 obj-$(CONFIG_NUMA_MEMBLKS) += numa_memblks.o
 obj-$(CONFIG_NUMA_EMU) += numa_emulation.o
-obj-$(CONFIG_MEMORY_BALLOON) += balloon.o
+obj-$(CONFIG_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/vmstat.c b/mm/vmstat.c
index e96a344ab59740740dcfe863fdcf7b9183a96a49..0f64c898f79f878cdf7688b158c059f2cbe55b1d 100644 (file)
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -1419,13 +1419,13 @@ const char * const vmstat_text[] = {
        [I(THP_SWPOUT)]                         = "thp_swpout",
        [I(THP_SWPOUT_FALLBACK)]                = "thp_swpout_fallback",
 #endif
-#ifdef CONFIG_MEMORY_BALLOON
+#ifdef CONFIG_BALLOON
        [I(BALLOON_INFLATE)]                    = "balloon_inflate",
        [I(BALLOON_DEFLATE)]                    = "balloon_deflate",
 #ifdef CONFIG_BALLOON_MIGRATION
        [I(BALLOON_MIGRATE)]                    = "balloon_migrate",
 #endif /* CONFIG_BALLOON_MIGRATION */
-#endif /* CONFIG_MEMORY_BALLOON */
+#endif /* CONFIG_BALLOON */
 #ifdef CONFIG_DEBUG_TLBFLUSH
        [I(NR_TLB_REMOTE_FLUSH)]                = "nr_tlb_remote_flush",
        [I(NR_TLB_REMOTE_FLUSH_RECEIVED)]       = "nr_tlb_remote_flush_received",