summaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorColin Cross <ccross@google.com>2010-08-21 17:26:52 -0700
committerColin Cross <ccross@android.com>2011-06-14 09:09:34 -0700
commit5eb6fdc0c710873d2be76db4965f247f484f531a (patch)
tree287726229faa2e3497a9bf711139577399ec5e0c /mm
parent4818e03a42d2e2886ee5360ea32da647aedb403b (diff)
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.c6
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;
}