diff options
| author | Colin Cross <ccross@google.com> | 2011-12-20 16:49:51 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-12-21 13:40:23 -0800 |
| commit | 1d3f8f2da1c28709a3c494f3872b89c871906b2d (patch) | |
| tree | be0116a9acc859a5acdba5e9bbfcac26cb5a4e0b /drivers/staging | |
| parent | 56f76fc68492af718fff88927bc296635d634b78 (diff) | |
| download | talos-obmc-linux-1d3f8f2da1c28709a3c494f3872b89c871906b2d.tar.gz talos-obmc-linux-1d3f8f2da1c28709a3c494f3872b89c871906b2d.zip | |
ashmem: Update arguments of shrinker for 2.6.35
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>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/android/ashmem.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/android/ashmem.c b/drivers/staging/android/ashmem.c index 0b923b01da51..40c3dc867bf9 100644 --- a/drivers/staging/android/ashmem.c +++ b/drivers/staging/android/ashmem.c @@ -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; } |
