ashmem: Update arguments of shrinker for 2.6.35
authorColin Cross <ccross@google.com>
Wed, 21 Dec 2011 00:49:51 +0000 (16:49 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 21 Dec 2011 21:40:23 +0000 (13:40 -0800)
Signed-off-by: Colin Cross <ccross@google.com>
CC: Brian Swetland <swetland@google.com>
CC: Colin Cross <ccross@android.com>
CC: Arve Hjønnevåg <arve@android.com>
CC: Dima Zavin <dima@android.com>
CC: Robert Love <rlove@google.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/android/ashmem.c

index 0b923b0..40c3dc8 100644 (file)
@@ -319,7 +319,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;
 
@@ -634,8 +634,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;
        }