diff options
| author | Colin Cross <ccross@google.com> | 2010-08-21 17:26:52 -0700 |
|---|---|---|
| committer | mgross <mark.gross@intel.com> | 2011-11-09 12:05:55 -0800 |
| commit | 8d19eb771736e6c9b3aaa2425e7ba8fe60399cb6 (patch) | |
| tree | 1d47ec6e2e812b3e4bb091a2ad342836b663bed5 /mm | |
| parent | f5f76ce4ba59c670a6d824d0734c90388cbb402c (diff) | |
| download | kernel-mfld-blackbay-8d19eb771736e6c9b3aaa2425e7ba8fe60399cb6.tar.gz kernel-mfld-blackbay-8d19eb771736e6c9b3aaa2425e7ba8fe60399cb6.tar.bz2 kernel-mfld-blackbay-8d19eb771736e6c9b3aaa2425e7ba8fe60399cb6.zip | |
ashmem: Update arguments of shrinker for 2.6.35
Change-Id: Ie527d18f3352ede06d565826c8d35ded1638203a
Signed-off-by: Colin Cross <ccross@google.com>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/ashmem.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mm/ashmem.c b/mm/ashmem.c index 7b75f41a2d4..b6c5e2aeca6 100644 --- a/mm/ashmem.c +++ b/mm/ashmem.c @@ -311,7 +311,7 @@ out: * chunks of ashmem regions LRU-wise one-at-a-time until we hit 'nr_to_scan' * pages freed. */ -static int ashmem_shrink(int nr_to_scan, gfp_t gfp_mask) +static int ashmem_shrink(struct shrinker *s, int nr_to_scan, gfp_t gfp_mask) { struct ashmem_range *range, *next; @@ -626,8 +626,8 @@ static long ashmem_ioctl(struct file *file, unsigned int cmd, unsigned long arg) case ASHMEM_PURGE_ALL_CACHES: ret = -EPERM; if (capable(CAP_SYS_ADMIN)) { - ret = ashmem_shrink(0, GFP_KERNEL); - ashmem_shrink(ret, GFP_KERNEL); + ret = ashmem_shrink(&ashmem_shrinker, 0, GFP_KERNEL); + ashmem_shrink(&ashmem_shrinker, ret, GFP_KERNEL); } break; } |