The patch titled memcg-fix-percpu-cached-charge-draining-frequency-fix has been added to the -mm tree. Its filename is memcg-fix-percpu-cached-charge-draining-frequency-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-fix-percpu-cached-charge-draining-frequency-fix From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> make percpu_charge_mutex static, tweak comments Cc: Daisuke Nishimura <nishimura@xxxxxxxxxxxxxxxxx> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx> Cc: Michal Hocko <mhocko@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/memcontrol.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff -puN mm/memcontrol.c~memcg-fix-percpu-cached-charge-draining-frequency-fix mm/memcontrol.c --- a/mm/memcontrol.c~memcg-fix-percpu-cached-charge-draining-frequency-fix +++ a/mm/memcontrol.c @@ -1938,7 +1938,7 @@ struct memcg_stock_pcp { #define FLUSHING_CACHED_CHARGE (0) }; static DEFINE_PER_CPU(struct memcg_stock_pcp, memcg_stock); -DEFINE_MUTEX(percpu_charge_mutex); +static DEFINE_MUTEX(percpu_charge_mutex); /* * Try to consume stocked charge on this cpu. If success, one page is consumed @@ -2023,10 +2023,10 @@ static void drain_all_stock_async(struct get_online_cpus(); /* - * get a hint for avoiding draining charges on the current cpu, - * which must be exhausted by our charging. But this is not - * required to be a precise check, We use raw_smp_processor_id() - * instead of getcpu()/putcpu(). + * Get a hint for avoiding draining charges on the current cpu, + * which must be exhausted by our charging. It is not required that + * this be a precise check, so we use raw_smp_processor_id() instead of + * getcpu()/putcpu(). */ curcpu = raw_smp_processor_id(); for_each_online_cpu(cpu) { _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch backlight-add-backlight-type-fix.patch vmscanmemcg-memcg-aware-swap-token-fix.patch vmscanmemcg-memcg-aware-swap-token-fix-checkpatch-fixes.patch memcg-add-documentation-for-the-memorynumastat-api-fix.patch mm-fix-negative-commitlimit-when-gigantic-hugepages-are-allocated-fix.patch memcg-fix-init_page_cgroup-nid-with-sparsemem-fix.patch memcg-clear-mm-owner-when-last-possible-owner-leaves-fix.patch memcg-fix-percpu-cached-charge-draining-frequency-fix.patch linux-next.patch next-remove-localversion.patch i-need-old-gcc.patch arch-alpha-kernel-systblss-remove-debug-check.patch cris-fix-a-build-error-in-kernel-forkc-checkpatch-fixes.patch arch-x86-include-asm-delayh-fix-udelay-and-ndelay-for-8-bit-args.patch slab-use-numa_no_node.patch mm.patch mm-extend-memory-hotplug-api-to-allow-memory-hotplug-in-virtual-machines-fix.patch pagewalk-add-locking-rule-comments-fix.patch frv-duplicate-output_buffer-of-e03-checkpatch-fixes.patch hpet-factor-timer-allocate-from-open.patch leds-route-kbd-leds-through-the-generic-leds-layer.patch checkpatch-suggest-using-min_t-or-max_t-v2.patch lib-hexdumpc-make-hex2bin-return-the-updated-src-address.patch fs-binfmt_miscc-use-kernels-hex_to_bin-method-fix.patch fs-binfmt_miscc-use-kernels-hex_to_bin-method-fix-fix.patch init-skip-calibration-delay-if-previously-done-fix.patch init-skip-calibration-delay-if-previously-done-fix-fix.patch init-calibratec-calibrate_delay-tidy-up-the-pr_info-messages.patch drivers-rtc-add-support-for-qualcomm-pmic8xxx-rtc-fix.patch cpusets-randomize-node-rotor-used-in-cpuset_mem_spread_node.patch cpusets-randomize-node-rotor-used-in-cpuset_mem_spread_node-fix-2.patch cpusets-randomize-node-rotor-used-in-cpuset_mem_spread_node-cpusets-initialize-spread-rotor-lazily-fix.patch scatterlist-new-helper-functions.patch scatterlist-new-helper-functions-update-fix.patch kexec-remove-kmsg_dump_kexec.patch journal_add_journal_head-debug.patch mutex-subsystem-synchro-test-module-fix.patch slab-leaks3-default-y.patch put_bh-debug.patch memblock-add-input-size-checking-to-memblock_find_region.patch memblock-add-input-size-checking-to-memblock_find_region-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