The patch titled Subject: mm-introduce-common-page-state-for-ballooned-memory-fix-v2 has been removed from the -mm tree. Its filename was mm-introduce-common-page-state-for-ballooned-memory-fix-v2.patch This patch was dropped because it was folded into mm-introduce-common-page-state-for-ballooned-memory.patch ------------------------------------------------------ From: Konstantin Khlebnikov <k.khlebnikov@xxxxxxxxxxx> Subject: mm-introduce-common-page-state-for-ballooned-memory-fix-v2 Signed-off-by: Konstantin Khlebnikov <k.khlebnikov@xxxxxxxxxxx> Cc: Rafael Aquini <aquini@xxxxxxxxxx> Cc: Andrey Ryabinin <ryabinin.a.a@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/virtio/Kconfig | 1 - include/linux/mm.h | 14 ++++++++++++-- mm/Makefile | 3 +-- mm/balloon_compaction.c | 16 ---------------- 4 files changed, 13 insertions(+), 21 deletions(-) diff -puN drivers/virtio/Kconfig~mm-introduce-common-page-state-for-ballooned-memory-fix-v2 drivers/virtio/Kconfig --- a/drivers/virtio/Kconfig~mm-introduce-common-page-state-for-ballooned-memory-fix-v2 +++ a/drivers/virtio/Kconfig @@ -25,7 +25,6 @@ config VIRTIO_PCI config VIRTIO_BALLOON tristate "Virtio balloon driver" depends on VIRTIO - select MEMORY_BALLOON ---help--- This driver supports increasing and decreasing the amount of memory within a KVM guest. diff -puN include/linux/mm.h~mm-introduce-common-page-state-for-ballooned-memory-fix-v2 include/linux/mm.h --- a/include/linux/mm.h~mm-introduce-common-page-state-for-ballooned-memory-fix-v2 +++ a/include/linux/mm.h @@ -561,8 +561,18 @@ static inline int PageBalloon(struct pag return IS_ENABLED(CONFIG_MEMORY_BALLOON) && atomic_read(&page->_mapcount) == PAGE_BALLOON_MAPCOUNT_VALUE; } -void __SetPageBalloon(struct page *page); -void __ClearPageBalloon(struct page *page); + +static inline void __SetPageBalloon(struct page *page) +{ + VM_BUG_ON_PAGE(atomic_read(&page->_mapcount) != -1, page); + atomic_set(&page->_mapcount, PAGE_BALLOON_MAPCOUNT_VALUE); +} + +static inline void __ClearPageBalloon(struct page *page) +{ + VM_BUG_ON_PAGE(!PageBalloon(page), page); + atomic_set(&page->_mapcount, -1); +} void put_page(struct page *page); void put_pages_list(struct list_head *pages); diff -puN mm/Makefile~mm-introduce-common-page-state-for-ballooned-memory-fix-v2 mm/Makefile --- a/mm/Makefile~mm-introduce-common-page-state-for-ballooned-memory-fix-v2 +++ a/mm/Makefile @@ -16,7 +16,7 @@ obj-y := filemap.o mempool.o oom_kill. readahead.o swap.o truncate.o vmscan.o shmem.o \ util.o mmzone.o vmstat.o backing-dev.o \ mm_init.o mmu_context.o percpu.o slab_common.o \ - compaction.o vmacache.o \ + compaction.o balloon_compaction.o vmacache.o \ interval_tree.o list_lru.o workingset.o \ iov_iter.o $(mmu-y) @@ -64,4 +64,3 @@ obj-$(CONFIG_ZBUD) += zbud.o obj-$(CONFIG_ZSMALLOC) += zsmalloc.o obj-$(CONFIG_GENERIC_EARLY_IOREMAP) += early_ioremap.o obj-$(CONFIG_CMA) += cma.o -obj-$(CONFIG_MEMORY_BALLOON) += balloon_compaction.o diff -puN mm/balloon_compaction.c~mm-introduce-common-page-state-for-ballooned-memory-fix-v2 mm/balloon_compaction.c --- a/mm/balloon_compaction.c~mm-introduce-common-page-state-for-ballooned-memory-fix-v2 +++ a/mm/balloon_compaction.c @@ -10,22 +10,6 @@ #include <linux/export.h> #include <linux/balloon_compaction.h> -void __SetPageBalloon(struct page *page) -{ - VM_BUG_ON_PAGE(atomic_read(&page->_mapcount) != -1, page); - atomic_set(&page->_mapcount, PAGE_BALLOON_MAPCOUNT_VALUE); - inc_zone_page_state(page, NR_BALLOON_PAGES); -} -EXPORT_SYMBOL(__SetPageBalloon); - -void __ClearPageBalloon(struct page *page) -{ - VM_BUG_ON_PAGE(!PageBalloon(page), page); - atomic_set(&page->_mapcount, -1); - dec_zone_page_state(page, NR_BALLOON_PAGES); -} -EXPORT_SYMBOL(__ClearPageBalloon); - /* * balloon_devinfo_alloc - allocates a balloon device information descriptor. * @balloon_dev_descriptor: pointer to reference the balloon device which _ Patches currently in -mm which might be from k.khlebnikov@xxxxxxxxxxx are include-linux-migrateh-remove-migratepage-define.patch mm-balloon_compaction-ignore-anonymous-pages.patch mm-balloon_compaction-keep-ballooned-pages-away-from-normal-migration-path.patch mm-balloon_compaction-isolate-balloon-pages-without-lru_lock.patch mm-introduce-common-page-state-for-ballooned-memory.patch mm-balloon_compaction-use-common-page-ballooning.patch mm-balloon_compaction-use-common-page-ballooning-fix.patch mm-balloon_compaction-use-common-page-ballooning-v2.patch mm-balloon_compaction-general-cleanup.patch linux-next.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html