The patch titled memcg-swap-cgroup-for-remembering-usage-fix has been added to the -mm tree. Its filename is memcg-swap-cgroup-for-remembering-usage-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/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: memcg-swap-cgroup-for-remembering-usage-fix From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Cc: Balbir Singh <balbir@xxxxxxxxxx> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx> Cc: Li Zefan <lizf@xxxxxxxxxxxxxx> Cc: Pavel Emelyanov <xemul@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/page_cgroup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN mm/page_cgroup.c~memcg-swap-cgroup-for-remembering-usage-fix mm/page_cgroup.c --- a/mm/page_cgroup.c~memcg-swap-cgroup-for-remembering-usage-fix +++ a/mm/page_cgroup.c @@ -272,7 +272,7 @@ void __init pgdat_page_cgroup_init(struc #ifdef CONFIG_CGROUP_MEM_RES_CTLR_SWAP -DEFINE_MUTEX(swap_cgroup_mutex); +static DEFINE_MUTEX(swap_cgroup_mutex); struct swap_cgroup_ctrl { spinlock_t lock; struct page **map; _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch mm-remove-the-might_sleep-from-lock_page.patch linux-next.patch next-remove-localversion.patch arch-x86-kernel-setupc-omit-dmi_low_memory_corruption-when-it-is-unneeded.patch tick-schedc-suppress-needless-timer-reprogramming.patch linux-timexh-cleanup-for-userspace.patch drivers-input-touchscreen-ucb1400_tsc-needs-gpio.patch input-ad7879-fix-workaroud-build-error-reported-by-andrew-morton.patch pci-uninline-pci_ioremap_bar.patch pcie-add-option-to-passively-listen-for-pcie-hotplug-events-checkpatch-fixes.patch vfs-lseekfd-0-seek_cur-race-condition-fix.patch bdi-register-sysfs-bdi-device-only-once-per-queue-fix.patch scsi-dpt_i2o-is-bust-on-ia64.patch netdev-smc911x-fix-for-driver-resume-cleanup.patch usb-serial-console-add-device-function-fix.patch mm-invoke-oom-killer-from-page-fault-fix.patch mm-invoke-oom-killer-from-page-fault-fix-fix-2.patch mm-write_cache_pages-more-terminate-quickly.patch init-properly-placing-noinline-keyword.patch add-pr_prefix-to-pr_xyz-macros-checkpatch-fixes.patch binfmtsh-include-listh-fix.patch max3100-spi-uart-driver-select-serial_core-fix.patch spi_gpio-driver-cleanups.patch kprobes-support-probing-module-__exit-function-fix.patch quota-permit-separately-enabling-quota-accounting-and-enforcing-limits-fix.patch quota-move-quotaio_vh-from-include-linux-to-fs-fix.patch quota-move-quotaio_vh-from-include-linux-to-fs-fix-2.patch quota-convert-union-in-mem_dqinfo-to-a-pointer-cleanup.patch quota-support-64-bit-quota-format-fix.patch quota-support-64-bit-quota-format-fix-2.patch quota-cleanup-use-inode-i_blkbits-to-get-block-bits-fix.patch memcg-introduce-charge-commit-cancel-style-of-functions-fix.patch memcg-swap-cgroup-for-remembering-usage-fix.patch edac-struct-device-replace-bus_id-with-dev_name-dev_set_name-checkpatch-fixes.patch edac-x38-use-the-architectures-readq-function-fix.patch filesystem-freeze-implement-generic-freeze-feature-fix.patch nilfs2-inode-operations-fix.patch nilfs2-pathname-operations-fix.patch nilfs2-super-block-operations-fix.patch reiser4.patch reiser4-tree_lock-fixes.patch reiser4-tree_lock-fixes-fix.patch reiser4-semaphore-fix.patch slb-drop-kmem-cache-argument-from-constructor-reiser4.patch reiser4-suid.patch reiser4-track-upstream-changes.patch reiser4-broke.patch nr_blockdev_pages-in_interrupt-warning.patch slab-leaks3-default-y.patch put_bh-debug.patch shrink_slab-handle-bad-shrinkers.patch getblk-handle-2tb-devices.patch getblk-handle-2tb-devices-fix.patch undeprecate-pci_find_device.patch notify_change-callers-must-hold-i_mutex.patch profile-likely-unlikely-macros.patch drivers-net-bonding-bond_sysfsc-suppress-uninitialized-var-warning.patch w1-build-fix.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