The patch titled percpu_counter: rename __percpu_counter_add() to percpu_counter_add_batch() has been added to the -mm tree. Its filename is percpu_counter-rename-__percpu_counter_add-to-percpu_counter_add_batch.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: percpu_counter: rename __percpu_counter_add() to percpu_counter_add_batch() From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> A more appropriate name for this exported API function. Cc: Eric Dumazet <eric.dumazet@xxxxxxxxx> Cc: Christoph Lameter <cl@xxxxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/backing-dev.h | 2 +- include/linux/percpu_counter.h | 6 +++--- kernel/sched.c | 2 +- lib/percpu_counter.c | 5 +++-- lib/proportions.c | 4 ++-- 5 files changed, 10 insertions(+), 9 deletions(-) diff -puN include/linux/backing-dev.h~percpu_counter-rename-__percpu_counter_add-to-percpu_counter_add_batch include/linux/backing-dev.h --- a/include/linux/backing-dev.h~percpu_counter-rename-__percpu_counter_add-to-percpu_counter_add_batch +++ a/include/linux/backing-dev.h @@ -123,7 +123,7 @@ static inline int wb_has_dirty_io(struct static inline void __add_bdi_stat(struct backing_dev_info *bdi, enum bdi_stat_item item, s64 amount) { - __percpu_counter_add(&bdi->bdi_stat[item], amount, BDI_STAT_BATCH); + percpu_counter_add_batch(&bdi->bdi_stat[item], amount, BDI_STAT_BATCH); } static inline void __inc_bdi_stat(struct backing_dev_info *bdi, diff -puN include/linux/percpu_counter.h~percpu_counter-rename-__percpu_counter_add-to-percpu_counter_add_batch include/linux/percpu_counter.h --- a/include/linux/percpu_counter.h~percpu_counter-rename-__percpu_counter_add-to-percpu_counter_add_batch +++ a/include/linux/percpu_counter.h @@ -40,13 +40,13 @@ int __percpu_counter_init(struct percpu_ void percpu_counter_destroy(struct percpu_counter *fbc); void percpu_counter_set(struct percpu_counter *fbc, s64 amount); -void __percpu_counter_add(struct percpu_counter *fbc, s64 amount, long batch); +void percpu_counter_add_batch(struct percpu_counter *fbc, s64 amount, long batch); s64 __percpu_counter_sum(struct percpu_counter *fbc); int percpu_counter_compare(struct percpu_counter *fbc, s64 rhs); static inline void percpu_counter_add(struct percpu_counter *fbc, s64 amount) { - __percpu_counter_add(fbc, amount, percpu_counter_batch); + percpu_counter_add_batch(fbc, amount, percpu_counter_batch); } /** @@ -146,7 +146,7 @@ percpu_counter_add_fast(struct percpu_co } static inline void -__percpu_counter_add(struct percpu_counter *fbc, s64 amount, long batch) +percpu_counter_add_batch(struct percpu_counter *fbc, s64 amount, long batch) { percpu_counter_add(fbc, amount); } diff -puN kernel/sched.c~percpu_counter-rename-__percpu_counter_add-to-percpu_counter_add_batch kernel/sched.c --- a/kernel/sched.c~percpu_counter-rename-__percpu_counter_add-to-percpu_counter_add_batch +++ a/kernel/sched.c @@ -9317,7 +9317,7 @@ static void cpuacct_update_stats(struct ca = task_ca(tsk); do { - __percpu_counter_add(&ca->cpustat[idx], val, batch); + percpu_counter_add_batch(&ca->cpustat[idx], val, batch); ca = ca->parent; } while (ca); rcu_read_unlock(); diff -puN lib/percpu_counter.c~percpu_counter-rename-__percpu_counter_add-to-percpu_counter_add_batch lib/percpu_counter.c --- a/lib/percpu_counter.c~percpu_counter-rename-__percpu_counter_add-to-percpu_counter_add_batch +++ a/lib/percpu_counter.c @@ -69,7 +69,8 @@ void percpu_counter_set(struct percpu_co } EXPORT_SYMBOL(percpu_counter_set); -void __percpu_counter_add(struct percpu_counter *fbc, s64 amount, long batch) +void +percpu_counter_add_batch(struct percpu_counter *fbc, s64 amount, long batch) { s64 count; long *pcount; @@ -87,7 +88,7 @@ void __percpu_counter_add(struct percpu_ } preempt_enable(); } -EXPORT_SYMBOL(__percpu_counter_add); +EXPORT_SYMBOL(percpu_counter_add_batch); /* * Add up all the per-cpu counts, return the result. This is a more accurate diff -puN lib/proportions.c~percpu_counter-rename-__percpu_counter_add-to-percpu_counter_add_batch lib/proportions.c --- a/lib/proportions.c~percpu_counter-rename-__percpu_counter_add-to-percpu_counter_add_batch +++ a/lib/proportions.c @@ -241,7 +241,7 @@ void prop_norm_percpu(struct prop_global if (val < (nr_cpu_ids * PROP_BATCH)) val = percpu_counter_sum(&pl->events); - __percpu_counter_add(&pl->events, -val + (val >> period), + percpu_counter_add_batch(&pl->events, -val + (val >> period), PROP_BATCH); } else percpu_counter_set(&pl->events, 0); @@ -258,7 +258,7 @@ void __prop_inc_percpu(struct prop_descr struct prop_global *pg = prop_get_global(pd); prop_norm_percpu(pg, pl); - __percpu_counter_add(&pl->events, 1, PROP_BATCH); + percpu_counter_add_batch(&pl->events, 1, PROP_BATCH); percpu_counter_add(&pg->events, 1); prop_put_global(pd, pg); } _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are typesh-move-misplaced-comment.patch kfifo-disable-__kfifo_must_check_helper.patch linux-next.patch next-remove-localversion.patch fs-inodec-work-around-bug.patch arch-x86-kernel-entry_64s-fix-build-with-gas-2161.patch arch-x86-kernel-entry_32s-i386-too.patch i-need-old-gcc.patch arch-alpha-kernel-systblss-remove-debug-check.patch mm-vmap-area-cache.patch gcc-46-btrfs-clean-up-unused-variables-bugs.patch drivers-gpu-drm-radeon-atomc-fix-warning.patch fs-notify-fanotify-fanotify_userc-fix-warnings.patch leds-route-kbd-leds-through-the-generic-leds-layer.patch leds-add-led-trigger-for-input-subsystem-led-events.patch backlight-add-low-threshold-to-pwm-backlight.patch serial8250-ratelimit-too-much-work-error.patch sched-make-sched_param-argument-static-variables-in-some-sched_setscheduler-caller.patch drivers-message-fusion-mptsasc-fix-warning.patch drivers-block-aoe-aoeblkc-ratelimit-a-warning-printk.patch vfs-allow-mnt_want_write-to-sleep.patch mm.patch oom-kill-all-threads-sharing-oom-killed-tasks-mm-fix.patch oom-kill-all-threads-sharing-oom-killed-tasks-mm-fix-fix.patch oom-rewrite-error-handling-for-oom_adj-and-oom_score_adj-tunables.patch oom-fix-locking-for-oom_adj-and-oom_score_adj.patch mm-only-build-per-node-scan_unevictable-functions-when-numa-is-enabled-cleanup.patch memory-hotplug-unify-is_removable-and-offline-detection-code-checkpatch-fixes.patch mm-stack-based-kmap_atomic-checkpatch-fixes.patch mm-stack-based-kmap_atomic-fix.patch mm-retry-page-fault-when-blocking-on-disk-transfer.patch mm-retry-page-fault-when-blocking-on-disk-transfer-update-fix.patch rmap-make-anon_vma_free-static-fix.patch vmstat-include-compactionh-when-config_compaction-fix.patch fs-fs-writebackc-restore-lost-comment.patch mm-memory_hotplugc-make-scan_lru_pages-static.patch proc-swaps-support-polling-fix.patch frv-duplicate-output_buffer-of-e03-checkpatch-fixes.patch hpet-factor-timer-allocate-from-open.patch hpet-factor-timer-allocate-from-open-fix.patch drivers-char-hpetc-fix-information-leak-to-userland-fix.patch kernelh-add-minmax3-macros-fix.patch include-linux-kernelh-add-__must_check-to-strict_strto.patch printk-declare-printk_ratelimit_state-in-ratelimith-fix.patch vsprintfc-use-default-pointer-field-size-for-null-strings-fix.patch scripts-get_maintainerpl-add-git-blame-rolestats-authored-lines-information.patch idr-fix-idr_pre_get-locking-description-fix.patch percpu_counter-rename-__percpu_counter_add-to-percpu_counter_add_batch.patch percpu_counters-inline-the-percpu_counter_add_batch-fastpath.patch checkpatch-returning-errno-typically-should-be-negative.patch select-rename-estimate_accuracy-to-select_estimate_accuracy.patch vcs-add-poll-fasync-support-fix-fix.patch rtc-rtc-s3c-fix-access-unit-from-byte-to-word-on-rtccon-checkpatch-fixes.patch drivers-rtc-rtc-jz4740c-add-alarm-function-checkpatch-fixes.patch gpio-add-support-for-74x164-serial-in-parallel-out-8-bit-shift-register-fix.patch cgroup_freezer-update_freezer_state-does-incorrect-state-transitions-checkpatch-fixes.patch memcg-cpu-hotplug-aware-quick-acount_move-detection-checkpatch-fixes.patch core_pattern-fix-long-parameters-was-truncated-by-core_pattern-handler-update.patch core_pattern-fix-long-parameters-was-truncated-by-core_pattern-handler-update-2.patch core_pattern-fix-long-parameters-was-truncated-by-core_pattern-handler-update-2-checkpatch-fixes.patch proc-stat-fix-scalability-of-irq-sum-of-all-cpu-fix.patch drivers-char-hvc_consolec-remove-unneeded-__set_current_statetask_running.patch delay-accounting-re-implement-c-for-getdelaysc-to-report-information-on-a-target-command-checkpatch-fixes.patch fuse-use-release_pages.patch pps-add-async-pps-event-handler-fix.patch memstick-add-driver-for-ricoh-r5c592-card-reader-fix.patch kernel-resourcec-handle-reinsertion-of-an-already-inserted-resource.patch ramoops-use-the-platform-data-structure-instead-of-module-params-fix.patch journal_add_journal_head-debug.patch slab-leaks3-default-y.patch put_bh-debug.patch getblk-handle-2tb-devices.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