The patch titled Subject: memcg-add-mlock-statistic-in-memorystat-fix has been removed from the -mm tree. Its filename was memcg-add-mlock-statistic-in-memorystat-fix.patch This patch was dropped because an updated version will be merged The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: memcg-add-mlock-statistic-in-memorystat-fix tweak comments Cc: Dan Magenheimer <dan.magenheimer@xxxxxxxxxx> Cc: Hillf Danton <dhillf@xxxxxxxxx> Cc: Hugh Dickins <hughd@xxxxxxxxxx> Cc: Johannes Weiner <hannes@xxxxxxxxxxx> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx> Cc: Mel Gorman <mel@xxxxxxxxx> Cc: Michal Hocko <mhocko@xxxxxxx> Cc: Rik van Riel <riel@xxxxxxxxxx> Cc: Ying Han <yinghan@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/internal.h | 4 ++-- mm/mlock.c | 6 +++--- mm/page_alloc.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff -puN mm/internal.h~memcg-add-mlock-statistic-in-memorystat-fix mm/internal.h --- a/mm/internal.h~memcg-add-mlock-statistic-in-memorystat-fix +++ a/mm/internal.h @@ -188,8 +188,8 @@ static inline void mlock_migrate_page(st { /* * Here we are supposed to update the page memcg's mlock stat and the - * newpage memcgs' mlock. Since the page and newpage are always being - * charged to the same memcg, so no need. + * newpage memcgs' mlock. Since the two pages are always being charged + * to the same memcg there is no need for this. */ if (TestClearPageMlocked(page)) { unsigned long flags; diff -puN mm/mlock.c~memcg-add-mlock-statistic-in-memorystat-fix mm/mlock.c --- a/mm/mlock.c~memcg-add-mlock-statistic-in-memorystat-fix +++ a/mm/mlock.c @@ -49,9 +49,9 @@ EXPORT_SYMBOL(can_do_mlock); */ /* - * LRU accounting for clear_page_mlock() - * Make sure the caller calls mem_cgroup_begin[end]_update_page_stat, - * otherwise it will be race between "move" and "page stat accounting". + * LRU accounting for clear_page_mlock() + * The caller must use mem_cgroup_begin[end]_update_page_stat to prevent a race + * between "move" and "page stat accounting". */ void __clear_page_mlock(struct page *page) { diff -puN mm/page_alloc.c~memcg-add-mlock-statistic-in-memorystat-fix mm/page_alloc.c --- a/mm/page_alloc.c~memcg-add-mlock-statistic-in-memorystat-fix +++ a/mm/page_alloc.c @@ -610,8 +610,8 @@ out: * Page should not be on lru, so no need to fix that up. * free_pages_check() will verify... * - * Make sure the caller calls mem_cgroup_begin[end]_update_page_stat, - * otherwise it will be race between "move" and "page stat accounting". + * The caller must use mem_cgroup_begin[end]_update_page_stat() to prevent a + * race between "move" and "page stat accounting". */ static inline void free_page_mlock(struct page *page) { _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are linux-next.patch i-need-old-gcc.patch arch-alpha-kernel-systblss-remove-debug-check.patch drivers-block-nvmec-stop-breaking-my-i386-build.patch drivers-staging-zsmalloc-zsmalloc-mainc-unbork.patch arch-x86-platform-iris-irisc-register-a-platform-device-and-a-platform-driver.patch arch-x86-kernel-apic-io_apicc-move-io_apic_level_ack_pending-inside-config_generic_pending_irq.patch drivers-xen-kconfig-fix-kconfig-layout.patch x86-use-this_cpu_xxx-to-replace-percpu_xxx-funcs.patch x86-use-this_cpu_xxx-to-replace-percpu_xxx-funcs-fix.patch percpu-remove-percpu_xxx-functions-fix.patch fs-symlink-restrictions-on-sticky-directories.patch fs-hardlink-creation-restrictions.patch brlocks-lglocks-cleanups.patch mm.patch hugetlb-use-mmu_gather-instead-of-a-temporary-linked-list-for-accumulating-pages-fix.patch hugetlb-use-mmu_gather-instead-of-a-temporary-linked-list-for-accumulating-pages-fix-fix.patch hugetlbfs-add-memcg-control-files-for-hugetlbfs-use-scnprintf-instead-of-sprintf-fix.patch memcg-move-hugetlb-resource-count-to-parent-cgroup-on-memcg-removal-fix.patch memcg-move-hugetlb-resource-count-to-parent-cgroup-on-memcg-removal-fix-fix.patch hugetlb-migrate-memcg-info-from-oldpage-to-new-page-during-migration-fix.patch mm-mmapc-find_vma-remove-unnecessary-ifmm-check-fix.patch mm-correctly-synchronize-rss-counters-at-exit-exec.patch mm-do_migrate_pages-calls-migrate_to_node-even-if-task-is-already-on-a-correct-node-fix.patch mm-do_migrate_pages-rename-arguments.patch mm-memcg-count-pte-references-from-every-member-of-the-reclaimed-hierarchy-fix.patch mm-rename-is_mlocked_vma-to-mlocked_vma_newpage-fix.patch mm-push-lru-index-into-shrink_active_list-fix.patch security-keys-keyctlc-suppress-memory-allocation-failure-warning.patch spinlockstxt-add-a-discussion-on-why-spin_is_locked-is-bad-fix.patch nmi-watchdog-fix-for-lockup-detector-breakage-on-resume-fix.patch nmi-watchdog-fix-for-lockup-detector-breakage-on-resume-fix-fix.patch vsprintf-correctly-handle-width-when-flag-used-in-%p-format-checkpatch-fixes.patch vsprintf-further-optimize-decimal-conversion-checkpatch-fixes.patch leds-led-module-for-da9052-53-pmic-v2-fix.patch leds-add-led-driver-for-lm3556-chip-checkpatch-fixes.patch leds-heartbeat-stop-on-shutdown-checkpatch-fixes.patch lib-string_helpersc-make-arrays-static.patch lib-bitmapc-fix-documentation-for-scnprintf-functions.patch rtc-rename-config_rtc_mxc-to-config_rtc_drv_mxc-fix.patch kmod-avoid-deadlock-by-recursive-kmod-call.patch proc-clean-up-proc-pid-environ-handling-checkpatch-fixes.patch eventfd-change-int-to-__u64-in-eventfd_signal-fix.patch syscalls-x86-add-__nr_kcmp-syscall-v8.patch syscalls-x86-add-__nr_kcmp-syscall-v8-comment-update-fix.patch c-r-prctl-simplify-pr_set_mm-on-mm-code-data-assignment-fix.patch c-r-prctl-add-ability-to-get-clear_tid_address.patch notify_change-check-that-i_mutex-is-held.patch journal_add_journal_head-debug.patch mutex-subsystem-synchro-test-module-fix.patch slab-leaks3-default-y.patch put_bh-debug.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