Commit 052a1cdb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'shrinker' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/xfsdev 

* 'shrinker' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/xfsdev:
  mm: add context argument to shrinker callback to remaining shrinkers
parents 84b37df4 567c7b0e

drivers/gpu/drm/ttm/ttm_page_alloc.c

+1 −1
Original line number Diff line number Diff line
@@ -394,7 +394,7 @@ static int ttm_pool_get_num_unused_pages(void) 
/**

 * Callback for mm to request pool to reduce number of page held.

 */

static int ttm_pool_mm_shrink(int shrink_pages, gfp_t gfp_mask)

static int ttm_pool_mm_shrink(struct shrinker *shrink, int shrink_pages, gfp_t gfp_mask)

{

	static atomic_t start_pool = ATOMIC_INIT(0);

	unsigned i;

net/sunrpc/auth.c

+1 −1
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ rpcauth_prune_expired(struct list_head *free, int nr_to_scan) 
 * Run memory cache shrinker.

 */

static int

rpcauth_cache_shrinker(int nr_to_scan, gfp_t gfp_mask)

rpcauth_cache_shrinker(struct shrinker *shrink, int nr_to_scan, gfp_t gfp_mask)

{

	LIST_HEAD(free);

	int res;