From: Andrew Morton Date: Fri, 7 Jun 2013 00:08:33 +0000 (+1000) Subject: hugepage-convert-huge-zero-page-shrinker-to-new-shrinker-api-fix X-Git-Tag: next-20130607~2^2~273 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=456fa627cdd60ac93a2a6c373ce9a2e5b7e879c5;p=karo-tx-linux.git hugepage-convert-huge-zero-page-shrinker-to-new-shrinker-api-fix fix warnings Cc: Dave Chinner Cc: Glauber Costa Signed-off-by: Andrew Morton --- diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 8dc36f559398..ed26ccbe4e6c 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -211,14 +211,14 @@ static void put_huge_zero_page(void) BUG_ON(atomic_dec_and_test(&huge_zero_refcount)); } -static long shrink_huge_zero_page_count(struct shrinker *shrink, +static unsigned long shrink_huge_zero_page_count(struct shrinker *shrink, struct shrink_control *sc) { /* we can free zero page only if last reference remains */ return atomic_read(&huge_zero_refcount) == 1 ? HPAGE_PMD_NR : 0; } -static long shrink_huge_zero_page_scan(struct shrinker *shrink, +static unsigned long shrink_huge_zero_page_scan(struct shrinker *shrink, struct shrink_control *sc) { if (atomic_cmpxchg(&huge_zero_refcount, 1, 0) == 1) {