Subject: [folded-merged] vmstat-create-separate-function-to-fold-per-cpu-diffs-into-local-counters-fix.patch removed from -mm tree To: akpm@xxxxxxxxxxxxxxxxxxxx,adobriyan@xxxxxxxxx,cl@xxxxxxxxx,js1304@xxxxxxxxx,kosaki.motohiro@xxxxxxxxxxxxxx,tj@xxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Wed, 11 Sep 2013 13:55:14 -0700 The patch titled Subject: vmstat-create-separate-function-to-fold-per-cpu-diffs-into-local-counters-fix has been removed from the -mm tree. Its filename was vmstat-create-separate-function-to-fold-per-cpu-diffs-into-local-counters-fix.patch This patch was dropped because it was folded into vmstat-create-separate-function-to-fold-per-cpu-diffs-into-local-counters.patch ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: vmstat-create-separate-function-to-fold-per-cpu-diffs-into-local-counters-fix fix UP build Cc: Alexey Dobriyan <adobriyan@xxxxxxxxx> Cc: Christoph Lameter <cl@xxxxxxxxx> Cc: Joonsoo Kim <js1304@xxxxxxxxx> Cc: KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxxxxxxx> Cc: Tejun Heo <tj@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/vmstat.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff -puN include/linux/vmstat.h~vmstat-create-separate-function-to-fold-per-cpu-diffs-into-local-counters-fix include/linux/vmstat.h --- a/include/linux/vmstat.h~vmstat-create-separate-function-to-fold-per-cpu-diffs-into-local-counters-fix +++ a/include/linux/vmstat.h @@ -198,7 +198,7 @@ extern void __inc_zone_state(struct zone extern void dec_zone_state(struct zone *, enum zone_stat_item); extern void __dec_zone_state(struct zone *, enum zone_stat_item); -void cpu_vm_stats_fold(int); +void cpu_vm_stats_fold(int cpu); void refresh_zone_stat_thresholds(void); void drain_zonestat(struct zone *zone, struct per_cpu_pageset *); @@ -255,6 +255,7 @@ static inline void __dec_zone_page_state static inline void refresh_cpu_vm_stats(int cpu) { } static inline void refresh_zone_stat_thresholds(void) { } +static inline void cpu_vm_stats_fold(int cpu) { } static inline void drain_zonestat(struct zone *zone, struct per_cpu_pageset *pset) { } _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch revert-include-linux-smph-on_each_cpu-switch-back-to-a-macro.patch block-support-embedded-device-command-line-partition.patch swap-warn-when-a-swap-area-overflows-the-maximum-size.patch mm-swapfilec-convert-to-pr_foo.patch mm-vmstats-track-tlb-flush-stats-on-up-too.patch swap-make-swap-discard-async.patch swap-make-cluster-allocation-per-cpu.patch mm-page_alloc-restructure-free-page-stealing-code-and-fix-a-bug.patch mm-hugetlb-decrement-reserve-count-if-vm_noreserve-alloc-page-cache.patch mm-mempolicy-return-null-if-node-is-numa_no_node-in-get_task_policy.patch vmstat-create-separate-function-to-fold-per-cpu-diffs-into-local-counters.patch genalloc-fix-overflow-of-ending-address-of-memory-chunk-fix.patch mm-use-zone_end_pfn-instead-of-zone_start_pfnspanned_pages-fix.patch mm-hotplug-verify-hotplug-memory-range-fix.patch mm-fix-aio-performance-regression-for-database-caused-by-thp-fix.patch mm-track-vma-changes-with-vm_softdirty-bit-fix.patch mm-munlock-bypass-per-cpu-pvec-for-putback_lru_page-fix.patch mm-vmscan-fix-do_try_to_free_pages-livelock-fix.patch mm-vmscan-fix-do_try_to_free_pages-livelock-fix-2.patch mm-page-writebackc-add-strictlimit-feature-fix.patch mm-madvisec-madvise_hwpoison-remove-local-ret.patch lib-crc32-update-the-comments-of-crc32_bele_generic-checkpatch-fixes.patch move-exit_task_namespaces-outside-of-exit_notify-fix.patch partitions-efi-use-lba-aware-partition-records-checkpatch-fixes.patch partitions-efi-check-pmbr-records-starting-lba-checkpatch-fixes.patch partitions-efi-detect-hybrid-mbrs-checkpatch-fixes.patch partitions-efi-some-style-cleanups-checkpatch-fixes.patch block-partitions-efic-consistently-use-pr_foo.patch initmpfs-move-bdi-setup-from-init_rootfs-to-init_ramfs-fix.patch initmpfs-use-initramfs-if-rootfstype=-or-root=-specified-checkpatch-fixes.patch ipc-drop-ipcctl_pre_down-fix.patch ipcshm-make-shmctl_nolock-lockless-checkpatch-fixes.patch drivers-staging-lustre-lustre-ptlrpc-sec_bulkc-rename-ptrs_per_page.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