From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: + shrinker-convert-remaining-shrinkers-to-count-scan-api-fix.patch added to -mm tree Date: Thu, 06 Jun 2013 15:31:15 -0700 Message-ID: <51b10db3.rt7g4Fn3OUXbULCZ%akpm@linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-path: Received: from mail.linuxfoundation.org ([140.211.169.12]:54267 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751848Ab3FFWbQ (ORCPT ); Thu, 6 Jun 2013 18:31:16 -0400 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: mm-commits@vger.kernel.org, glommer@openvz.org, dchinner@redhat.com, akpm@linux-foundation.org Subject: + shrinker-convert-remaining-shrinkers-to-count-scan-api-fix.patch added to -mm tree To: akpm@linux-foundation.org,dchinner@redhat.com,glommer@openvz.org From: akpm@linux-foundation.org Date: Thu, 06 Jun 2013 15:31:15 -0700 The patch titled Subject: shrinker-convert-remaining-shrinkers-to-count-scan-api-fix has been added to the -mm tree. Its filename is shrinker-convert-remaining-shrinkers-to-count-scan-api-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 *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Andrew Morton Subject: shrinker-convert-remaining-shrinkers-to-count-scan-api-fix fix warnings Cc: Dave Chinner Cc: Glauber Costa Signed-off-by: Andrew Morton --- arch/x86/kvm/mmu.c | 9 +++++---- net/sunrpc/auth.c | 6 +++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff -puN arch/x86/kvm/mmu.c~shrinker-convert-remaining-shrinkers-to-count-scan-api-fix arch/x86/kvm/mmu.c --- a/arch/x86/kvm/mmu.c~shrinker-convert-remaining-shrinkers-to-count-scan-api-fix +++ a/arch/x86/kvm/mmu.c @@ -4213,12 +4213,12 @@ restart: spin_unlock(&kvm->mmu_lock); } -static long +static unsigned long mmu_shrink_scan(struct shrinker *shrink, struct shrink_control *sc) { struct kvm *kvm; int nr_to_scan = sc->nr_to_scan; - long freed = 0; + unsigned long freed = 0; raw_spin_lock(&kvm_lock); @@ -4246,7 +4246,8 @@ mmu_shrink_scan(struct shrinker *shrink, idx = srcu_read_lock(&kvm->srcu); spin_lock(&kvm->mmu_lock); - freed += prepare_zap_oldest_mmu_page(kvm, &invalid_list); + if (prepare_zap_oldest_mmu_page(kvm, &invalid_list)) + freed++; kvm_mmu_commit_zap_page(kvm, &invalid_list); spin_unlock(&kvm->mmu_lock); @@ -4266,7 +4267,7 @@ mmu_shrink_scan(struct shrinker *shrink, } -static long +static unsigned long mmu_shrink_count(struct shrinker *shrink, struct shrink_control *sc) { return percpu_counter_read_positive(&kvm_total_used_mmu_pages); diff -puN net/sunrpc/auth.c~shrinker-convert-remaining-shrinkers-to-count-scan-api-fix net/sunrpc/auth.c --- a/net/sunrpc/auth.c~shrinker-convert-remaining-shrinkers-to-count-scan-api-fix +++ a/net/sunrpc/auth.c @@ -454,12 +454,12 @@ rpcauth_prune_expired(struct list_head * /* * Run memory cache shrinker. */ -static long +static unsigned long rpcauth_cache_shrink_scan(struct shrinker *shrink, struct shrink_control *sc) { LIST_HEAD(free); - long freed; + unsigned long freed; if ((sc->gfp_mask & GFP_KERNEL) != GFP_KERNEL) return SHRINK_STOP; @@ -476,7 +476,7 @@ rpcauth_cache_shrink_scan(struct shrinke return freed; } -static long +static unsigned long rpcauth_cache_shrink_count(struct shrinker *shrink, struct shrink_control *sc) { _ Patches currently in -mm which might be from akpm@linux-foundation.org are linux-next.patch linux-next-git-rejects.patch arch-alpha-kernel-systblss-remove-debug-check.patch i-need-old-gcc.patch kmsg-honor-dmesg_restrict-sysctl-on-dev-kmsg-fix.patch drivers-rtc-rtc-cmosc-fix-accidentally-enabling-rtc-channel-fix.patch drivers-base-cpuc-fix-maxcpus-boot-option-fix.patch sound-soc-codecs-si476xc-dont-use-0bnnn.patch drivers-iommu-msm_iommu_devc-fix-leak-and-clean-up-error-paths-fix.patch posix-timers-correctly-get-dying-task-time-sample-in-posix_cpu_timer_schedule.patch mm.patch clear_refs-sanitize-accepted-commands-declaration.patch mm-remove-compressed-copy-from-zram-in-memory-fix.patch memory_hotplug-use-pgdat_resize_lock-in-__offline_pages-fix.patch include-linux-mmh-add-page_aligned-helper.patch vmcore-allocate-buffer-for-elf-headers-on-page-size-alignment-fix.patch vmalloc-introduce-remap_vmalloc_range_partial-fix.patch vmcore-allocate-elf-note-segment-in-the-2nd-kernel-vmalloc-memory-fix.patch vmcore-allow-user-process-to-remap-elf-note-segment-buffer-fix.patch vmcore-support-mmap-on-proc-vmcore-fix.patch mm-remove-lru-parameter-from-__lru_cache_add-and-lru_cache_add_lru.patch mm-tune-vm_committed_as-percpu_counter-batching-size-fix.patch swap-discard-while-swapping-only-if-swap_flag_discard_pages-fix.patch mm-correctly-update-zone-managed_pages-fix.patch shrinker-convert-superblock-shrinkers-to-new-api-fix.patch fs-convert-fs-shrinkers-to-new-scan-count-api-fix.patch shrinker-convert-remaining-shrinkers-to-count-scan-api-fix.patch hugepage-convert-huge-zero-page-shrinker-to-new-shrinker-api-fix.patch include-linux-mmzoneh-cleanups.patch include-linux-mmzoneh-cleanups-fix.patch drop_caches-add-some-documentation-and-info-messsge.patch clean-up-scary-strncpydst-src-strlensrc-uses-fix.patch dump_stack-serialize-the-output-from-dump_stack-fix.patch panic-add-cpu-pid-to-warn_slowpath_common-in-warning-printks-fix.patch rbtree-remove-unneeded-include-fix.patch checkpatch-warn-when-using-gccs-binary-constant-extension.patch binfmt_elfc-use-get_random_int-to-fix-entropy-depleting.patch fat-additions-to-support-fat_fallocate-fix.patch ptrace-add-ability-to-get-set-signal-blocked-mask-fix.patch dev-oldmem-remove-the-interface-fix.patch idr-print-a-stack-dump-after-ida_remove-warning-fix.patch shm-fix-null-pointer-deref-when-userspace-specifies-invalid-hugepage-size-fix.patch partitions-add-aix-lvm-partition-support-files-checkpatch-fixes.patch drivers-w1-slaves-w1_ds2408c-add-magic-sequence-to-disable-p0-test-mode-fix.patch lib-add-lz4-compressor-module-fix.patch crypto-add-lz4-cryptographic-api-fix.patch debugging-keep-track-of-page-owners-fix-2-fix.patch debugging-keep-track-of-page-owners-fix-2-fix-fix-fix.patch journal_add_journal_head-debug.patch kernel-forkc-export-kernel_thread-to-modules.patch mutex-subsystem-synchro-test-module.patch slab-leaks3-default-y.patch put_bh-debug.patch