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

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
...@@ -394,7 +394,7 @@ static int ttm_pool_get_num_unused_pages(void) ...@@ -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. * 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); static atomic_t start_pool = ATOMIC_INIT(0);
unsigned i; unsigned i;
......
...@@ -267,7 +267,7 @@ rpcauth_prune_expired(struct list_head *free, int nr_to_scan) ...@@ -267,7 +267,7 @@ rpcauth_prune_expired(struct list_head *free, int nr_to_scan)
* Run memory cache shrinker. * Run memory cache shrinker.
*/ */
static int 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); LIST_HEAD(free);
int res; int res;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment