diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-21 09:30:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-21 09:30:59 -0700 |
| commit | 052a1cdbfabf2d122ee4eb5ce34ae1e1d72ded09 (patch) | |
| tree | d6a770ba38583ed4bb4525bd96e50461655d2758 | |
| parent | 84b37df4198f8e68a731f1d7daac3465cbbea241 (diff) | |
| parent | 567c7b0edec0200c5c6613f07c3d3b4034fdc836 (diff) | |
| download | linux-052a1cdbfabf2d122ee4eb5ce34ae1e1d72ded09.tar.gz linux-052a1cdbfabf2d122ee4eb5ce34ae1e1d72ded09.tar.bz2 linux-052a1cdbfabf2d122ee4eb5ce34ae1e1d72ded09.zip | |
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
| -rw-r--r-- | drivers/gpu/drm/ttm/ttm_page_alloc.c | 2 | ||||
| -rw-r--r-- | net/sunrpc/auth.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c index 1f32b460adce..d233c65f3f7f 100644 --- a/drivers/gpu/drm/ttm/ttm_page_alloc.c +++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c @@ -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; diff --git a/net/sunrpc/auth.c b/net/sunrpc/auth.c index 73affb8624fa..8dc47f1d0001 100644 --- a/net/sunrpc/auth.c +++ b/net/sunrpc/auth.c @@ -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; |