The patch titled Subject: memory_hotplug-free-pages-as-higher-order-fix-fix has been added to the -mm tree. Its filename is memory_hotplug-free-pages-as-higher-order-fix-fix.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/memory_hotplug-free-pages-as-higher-order-fix-fix.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/memory_hotplug-free-pages-as-higher-order-fix-fix.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: memory_hotplug-free-pages-as-higher-order-fix-fix fix it for mm-convert-totalram_pages-and-totalhigh_pages-variables-to-atomic.patch Cc: Arun KS <arunks@xxxxxxxxxxxxxx> Cc: Oscar Salvador <osalvador@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/memory_hotplug.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/mm/memory_hotplug.c~memory_hotplug-free-pages-as-higher-order-fix-fix +++ a/mm/memory_hotplug.c @@ -658,10 +658,10 @@ EXPORT_SYMBOL_GPL(__online_page_free); static int generic_online_page(struct page *page, unsigned int order) { __free_pages_core(page, order); - totalram_pages += (1UL << order); + totalram_pages_add(1UL << order); #ifdef CONFIG_HIGHMEM if (PageHighMem(page)) - totalhigh_pages += (1UL << order); + totalhigh_pages_add(1UL << order); #endif return 0; } _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are mm-cleancache-fix-corruption-on-missed-inode-invalidation-fix.patch arm-arch-arm-include-asm-pageh-needs-personalityh.patch mm.patch mm-slab-remove-unnecessary-unlikely-fix.patch mm-slub-record-final-state-of-slub-action-in-deactivate_slab-fix.patch mm-page_owner-clamp-read-count-to-page_size-fix.patch mm-hotplug-optimize-clear_hwpoisoned_pages-fix.patch mm-ksm-do-not-block-on-page-lock-when-searching-stable-tree-fix.patch mm-memory_hotplug-print-reason-for-the-offlining-failure-fix.patch mm-memory_hotplug-be-more-verbose-for-memory-offline-failures-fix.patch mm-convert-totalram_pages-and-totalhigh_pages-variables-to-atomic-checkpatch-fixes.patch memory_hotplug-free-pages-as-higher-order-fix.patch memory_hotplug-free-pages-as-higher-order-fix-fix.patch fs-epoll-deal-with-wait_queue-only-once-fix.patch exec-separate-mm_anonpages-and-rlimit_stack-accounting-checkpatch-fixes.patch ipc-allow-boot-time-extension-of-ipcmni-from-32k-to-8m-checkpatch-fixes.patch scripts-atomic-check-atomicssh-dont-assume-that-scripts-are-executable.patch drivers-net-ethernet-qlogic-qed-qed_rdmah-fix-typo.patch kernel-forkc-export-kernel_thread-to-modules.patch slab-leaks3-default-y.patch