tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

authored by

David Hildenbrand (Red Hat) and committed by
Andrew Morton 14217580 cd8e95d8

+10 -10
+1 -1
arch/powerpc/platforms/pseries/Kconfig
··· 120 120 config CMM 121 121 tristate "Collaborative memory management" 122 122 depends on PPC_SMLPAR 123 - select MEMORY_BALLOON 123 + select BALLOON 124 124 default y 125 125 help 126 126 Select this option, if you want to enable the kernel interface
+1 -1
drivers/misc/Kconfig
··· 410 410 config VMWARE_BALLOON 411 411 tristate "VMware Balloon Driver" 412 412 depends on VMWARE_VMCI && X86 && HYPERVISOR_GUEST 413 - select MEMORY_BALLOON 413 + select BALLOON 414 414 help 415 415 This is VMware physical memory management driver which acts 416 416 like a "balloon" that can be inflated to reclaim physical pages
+1 -1
drivers/virtio/Kconfig
··· 112 112 config VIRTIO_BALLOON 113 113 tristate "Virtio balloon driver" 114 114 depends on VIRTIO 115 - select MEMORY_BALLOON 115 + select BALLOON 116 116 select PAGE_REPORTING 117 117 help 118 118 This driver supports increasing and decreasing the amount
+2 -2
include/linux/vm_event_item.h
··· 122 122 THP_SWPOUT, 123 123 THP_SWPOUT_FALLBACK, 124 124 #endif 125 - #ifdef CONFIG_MEMORY_BALLOON 125 + #ifdef CONFIG_BALLOON 126 126 BALLOON_INFLATE, 127 127 BALLOON_DEFLATE, 128 128 #ifdef CONFIG_BALLOON_MIGRATION 129 129 BALLOON_MIGRATE, 130 130 #endif /* CONFIG_BALLOON_MIGRATION */ 131 - #endif 131 + #endif /* CONFIG_BALLOON */ 132 132 #ifdef CONFIG_DEBUG_TLBFLUSH 133 133 NR_TLB_REMOTE_FLUSH, /* cpu tried to flush others' tlbs */ 134 134 NR_TLB_REMOTE_FLUSH_RECEIVED,/* cpu received ipi for flush */
+2 -2
mm/Kconfig
··· 593 593 594 594 # 595 595 # support for memory balloon 596 - config MEMORY_BALLOON 596 + config BALLOON 597 597 bool 598 598 599 599 # ··· 601 601 config BALLOON_MIGRATION 602 602 bool "Allow for balloon memory migration" 603 603 default y 604 - depends on MIGRATION && MEMORY_BALLOON 604 + depends on MIGRATION && BALLOON 605 605 help 606 606 Allow for migration of pages inflated in a memory balloon such that 607 607 they can be allocated from memory areas only available for movable
+1 -1
mm/Makefile
··· 122 122 obj-$(CONFIG_NUMA) += numa.o 123 123 obj-$(CONFIG_NUMA_MEMBLKS) += numa_memblks.o 124 124 obj-$(CONFIG_NUMA_EMU) += numa_emulation.o 125 - obj-$(CONFIG_MEMORY_BALLOON) += balloon.o 125 + obj-$(CONFIG_BALLOON) += balloon.o 126 126 obj-$(CONFIG_PAGE_EXTENSION) += page_ext.o 127 127 obj-$(CONFIG_PAGE_TABLE_CHECK) += page_table_check.o 128 128 obj-$(CONFIG_CMA_DEBUGFS) += cma_debug.o
+2 -2
mm/vmstat.c
··· 1419 1419 [I(THP_SWPOUT)] = "thp_swpout", 1420 1420 [I(THP_SWPOUT_FALLBACK)] = "thp_swpout_fallback", 1421 1421 #endif 1422 - #ifdef CONFIG_MEMORY_BALLOON 1422 + #ifdef CONFIG_BALLOON 1423 1423 [I(BALLOON_INFLATE)] = "balloon_inflate", 1424 1424 [I(BALLOON_DEFLATE)] = "balloon_deflate", 1425 1425 #ifdef CONFIG_BALLOON_MIGRATION 1426 1426 [I(BALLOON_MIGRATE)] = "balloon_migrate", 1427 1427 #endif /* CONFIG_BALLOON_MIGRATION */ 1428 - #endif /* CONFIG_MEMORY_BALLOON */ 1428 + #endif /* CONFIG_BALLOON */ 1429 1429 #ifdef CONFIG_DEBUG_TLBFLUSH 1430 1430 [I(NR_TLB_REMOTE_FLUSH)] = "nr_tlb_remote_flush", 1431 1431 [I(NR_TLB_REMOTE_FLUSH_RECEIVED)] = "nr_tlb_remote_flush_received",