The patch titled zoned-vm-counters-basic-zvc-zoned-vm-counter-implementation-tidy has been added to the -mm tree. Its filename is zoned-vm-counters-basic-zvc-zoned-vm-counter-implementation-tidy.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: zoned-vm-counters-basic-zvc-zoned-vm-counter-implementation-tidy From: Andrew Morton <akpm@xxxxxxxx> Cc: Christoph Lameter <clameter@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- include/linux/vmstat.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff -puN include/linux/vmstat.h~zoned-vm-counters-basic-zvc-zoned-vm-counter-implementation-tidy include/linux/vmstat.h --- a/include/linux/vmstat.h~zoned-vm-counters-basic-zvc-zoned-vm-counter-implementation-tidy +++ a/include/linux/vmstat.h @@ -191,8 +191,10 @@ void __mod_zone_page_state(struct zone * void __inc_zone_page_state(struct page *, enum zone_stat_item); void __dec_zone_page_state(struct page *, enum zone_stat_item); -#define __add_zone_page_state(__z, __i, __d) __mod_zone_page_state(__z, __i, __d) -#define __sub_zone_page_state(__z, __i, __d) __mod_zone_page_state(__z, __i,-(__d)) +#define __add_zone_page_state(__z, __i, __d) \ + __mod_zone_page_state(__z, __i, __d) +#define __sub_zone_page_state(__z, __i, __d) \ + __mod_zone_page_state(__z, __i,-(__d)) void mod_zone_page_state(struct zone *, enum zone_stat_item, int); void inc_zone_page_state(struct page *, enum zone_stat_item); @@ -201,7 +203,8 @@ void dec_zone_page_state(struct page *, #define add_zone_page_state(__z, __i, __d) mod_zone_page_state(__z, __i, __d) #define sub_zone_page_state(__z, __i, __d) mod_zone_page_state(__z, __i, -(__d)) -static inline void zap_zone_vm_stats(struct zone *zone) { +static inline void zap_zone_vm_stats(struct zone *zone) +{ memset(zone->vm_stat, 0, sizeof(zone->vm_stat)); } @@ -214,4 +217,3 @@ static inline void refresh_vm_stats(void #endif #endif /* _LINUX_VMSTAT_H */ - _ Patches currently in -mm which might be from akpm@xxxxxxxx are origin.patch suspend_console-warning-fix.patch myri10ge-build-fix.patch revert-powernow-k8-crash-workaround.patch git-acpi-pre.patch git-acpi.patch git-acpi-post.patch git-acpi-fixup.patch git-acpi-ia64-build-fix.patch reapply-powernow-k8-crash-workaround.patch acpi-update-asus_acpi-driver-registration-fix.patch catch-notification-of-memory-add-event-of-acpi-via-container-driver-register-start-func-for-memory-device.patch catch-notification-of-memory-add-event-of-acpi-via-container-driveravoid-redundant-call-add_memory.patch remove-for_each_cpu.patch sony_apci-resume.patch ati-agp-build-fix.patch kauditd_thread-warning-fix.patch git-block.patch git-cifs.patch git-dvb.patch tea575x-tuner-build-fix.patch git-dvb-versus-matroxfb.patch git-dvb-printk-warning-fix.patch i2c-801-64bit-resource-fix.patch git-gfs2.patch git-infiniband.patch git-infiniband-fixup.patch git-input.patch git-kbuild.patch revert-sparc-build-breakage.patch git-klibc.patch git-klibc-fixup.patch git-hdrcleanup-vs-git-klibc-on-ia64.patch git-hdrcleanup-vs-git-klibc-on-ia64-2.patch git-hdrinstall-fixup.patch git-libata-all.patch git-libata-all-fixup.patch git-libata-all-data_xfer-fixes.patch git-libata-all-data_xfer-fixes-fixes.patch libata-reduce-timeouts.patch via-pata-fails-on-some-atapi-drives-tidy.patch git-netdev-all.patch forcedeth-typecast-cleanup.patch s2io-driver-irq-fix-tidy.patch qla3xxx-NIC-driver-tidy.patch atm-mpcc-warning-fix.patch git-nfs-fixup.patch git-nfs-build-fixes.patch nfs-build-fix-99.patch git-powerpc.patch serial-8250-sysrq-deadlock-fix.patch revert-gregkh-pci-pci-test-that-drivers-properly-call-pci_set_master.patch 64-bit-resources-lose-some-ifdefs.patch clear-abnormal-poweroff-flag-on-via-southbridges-fix-resume-fix.patch areca-raid-linux-scsi-driver.patch git-scsi-target-fixup.patch usb-move-linux-usb_input.h-to-linux-usb-input-fix.patch ipaqc-timing-parameters-fix.patch git-supertrak-fixup.patch revert-x86_64-mm-twofish-cipher---x86_64-assembler.patch revert-x86_64-mm-twofish-cipher---i586-assembler.patch revert-x86_64-mm-twofish-cipher---priority-fix.patch revert-x86_64-mm-twofish-cipher---split-out-common-c-code.patch x86_64-mm-moving-phys_proc_id-and-cpu_core_id-to-cpuinfo_x86-warning-fix.patch git-xfs.patch pg_uncached-is-ia64-only.patch pgdat-allocation-for-new-node-add-export-kswapd-start-func-fix.patch fix-update_mmu_cache-in-fremapc-fix.patch initialise-total_memory-earlier.patch page-migration-simplify-migrate_pages.patch page-migration-support-moving-of-individual-pages-x86-support.patch radix-tree-rcu-lockless-readside-wraning-fix.patch radix-tree-rcu-lockless-readside-fix.patch zoned-vm-counters-basic-zvc-zoned-vm-counter-implementation-tidy.patch zoned-vm-counters-remove-nr_file_mapped-from-scan-control-structure-fix.patch zoned-vm-counters-conversion-of-nr_writeback-to-per-zone-counter.patch zoned-vm-counters-conversion-of-nr_bounce-to-per-zone-counter.patch acx1xx-wireless-driver.patch tiacx-pci-build-fix.patch tiacx-ia64-fix.patch x86-kernel-irq-balancer-fix-tidy.patch i386-moving-phys_proc_id-and-cpu_core_id-to-cpuinfo_x86-warning-fix.patch cpu_relax-smpbootc-fix.patch vdso-randomize-the-i386-vdso-by-moving-it-into-a-vma-tidy.patch vdso-randomize-the-i386-vdso-by-moving-it-into-a-vma-arch_vma_name-fix.patch vdso-randomize-the-i386-vdso-by-moving-it-into-a-vma-vs-x86_64-mm-reliable-stack-trace-support-i386.patch vdso-randomize-the-i386-vdso-by-moving-it-into-a-vma-vs-x86_64-mm-reliable-stack-trace-support-i386-2.patch vdso-randomize-the-i386-vdso-by-moving-it-into-a-vma-vs-x86_64-mm-reliable-stack-trace-support-i386-2-revert-maxmem-change.patch prune_one_dentry-tweaks.patch mmput-might-sleep.patch jbd-avoid-kfree-null.patch ext3_clear_inode-avoid-kfree-null.patch leds-amstrad-delta-led-support-tidy.patch connector-exports.patch config_net=n-build-fix.patch rewritten-backlight-infrastructure-for-portable-apple-computers-fix.patch deprecate-smbfs-in-favour-of-cifs.patch ufs-printk-warning-fixes.patch msnd-section-fix.patch openpromfs-factorize-out-tidy.patch add-driver-for-arm-amba-pl031-rtc-fix.patch add-export_unused_symbol-and-export_unused_symbol_gpl-default.patch kernel-sysc-cleanups-fix.patch cpqarray-section-fix.patch pdflush-handle-resume-wakeups.patch schedule_on_each_cpu-reduce-kmalloc-size.patch load_module-cleanup.patch ax88796-parallel-port-driver-build-fix.patch for_each_cpu_mask-warning-fix.patch add-max6902-rtc-support-tidy.patch add-v3020-rtc-support-tidy.patch at91rm9200-rtc-driver-tidy.patch readahead-backoff-on-i-o-error-tweaks.patch cyclades-cleanup-cleanup.patch fuse-add-control-filesystem-printk-fix.patch kthread-update-loopc-to-use-kthread-fix.patch kthread-convert-smbiod-tidy.patch kthread-convert-stop_machine-into-a-kthread.patch stop-on-cpu-lost-tidy.patch fix-bounds-check-in-vsnprintf-to-allow-for-a-0-size-and-tidy.patch irda-usb-printk-fix.patch reiserfs-on-demand-bitmap-loading-fix.patch per-task-delay-accounting-proc-export-of-aggregated-block-i-o-delays-warning-fix.patch add-via-hw-rng-driver-fix.patch add-bcm43xx-hw-rng-support-locking-update.patch hangcheck-remove-monotomic_clock-on-x86.patch sched-fix-smt-nice-lock-contention-and-optimization-tidy.patch pi-futex-rt-mutex-tester-fix.patch mark-address_space_operations-const-vs-ecryptfs-mmap-operations.patch ecryptfs-alpha-build-fix.patch ecryptfs-more-elegant-aes-key-size-manipulation-tidy.patch namespaces-add-nsproxy-dont-include-compileh.patch namespaces-utsname-switch-to-using-uts-namespaces-alpha-fix.patch namespaces-utsname-use-init_utsname-when-appropriate-cifs-update.patch namespaces-utsname-implement-utsname-namespaces-export.patch namespaces-utsname-implement-utsname-namespaces-dont-include-compileh.patch namespaces-utsname-sysctl-hack-cleanup-2-fix.patch ipc-namespace-core-fix.patch task-watchers-task-watchers-tidy.patch task-watchers-add-support-for-per-task-watchers-warning-fix.patch readahead-sysctl-parameters-fix.patch make-copy_from_user_inatomic-not-zero-the-tail-on-i386-vs-reiser4.patch reiser4-hardirq-include-fix.patch reiser4-run-truncate_inode_pages-in-reiser4_delete_inode.patch ide_dma_speed-fixes-warning-fix.patch ide_dma_speed-fixes-tidy.patch hpt3xx-rework-rate-filtering-tidy.patch hpt370-clean-up-dma-timeout-handling-cleanup.patch savagefb-add-state-save-and_restore-hooks-tidy.patch au1100fb-add-power-management-support-tidy.patch vt-binding-add-sysfs-control-to-the-vt-layer-fix.patch lib-add-idr_replace-tidy.patch genirq-rename-desc-handler-to-desc-chip-power-fix.patch genirq-rename-desc-handler-to-desc-chip-ia64-fix.patch genirq-rename-desc-handler-to-desc-chip-ia64-fix-2.patch genirq-rename-desc-handler-to-desc-chip-terminate_irqs-fix.patch genirq-convert-the-i386-architecture-to-irq-chips-fix-2.patch genirq-ia64-build-fix.patch lock-validator-beautify-x86_64-stacktraces-fix.patch lock-validator-beautify-x86_64-stacktraces-fix-4.patch lock-validator-stacktrace-build-fix.patch lock-validator-stacktrace-warning-fix.patch lock-validator-irqtrace-core-powerpc-fix-1.patch lock-validator-irqtrace-core-non-x86-fix.patch lock-validator-irqtrace-core-non-x86-fix-2.patch lock-validator-irqtrace-core-non-x86-fix-3.patch lock-validator-add-per_cpu_offset-fix.patch lock-validator-core-multichar-fix.patch lock-validator-prove-rwsem-locking-correctness-fix.patch lock-validator-prove-rwsem-locking-correctness-powerpc-fix.patch lock-validator-special-locking-serial-fix.patch lock-validator-special-locking-af_unix-undo-af_unix-_bh-locking-changes-and-split-lock-type-fix.patch lock-validator-special-locking-sb-s_umount-fix.patch lock-validator-enable-lock-validator-in-kconfig-not-yet.patch lockdep-x86-only.patch lockdep-really-x86-only.patch lockdep-really-really-x86-only.patch lockdep-hack-around-build-errors.patch kgdb-core-lite-add-reboot-command.patch kgdb-8250-fix.patch nr_blockdev_pages-in_interrupt-warning.patch device-suspend-debug.patch revert-tty-buffering-comment-out-debug-code.patch slab-leaks3-default-y.patch x86-kmap_atomic-debugging.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