Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d3f8f2d authored by Colin Cross's avatar Colin Cross Committed by Greg Kroah-Hartman
Browse files

ashmem: Update arguments of shrinker for 2.6.35 



Signed-off-by: default avatarColin 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: default avatarJohn Stultz <john.stultz@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 56f76fc6

drivers/staging/android/ashmem.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -319,7 +319,7 @@ static int ashmem_mmap(struct file *file, struct vm_area_struct *vma) 
 * chunks of ashmem regions LRU-wise one-at-a-time until we hit 'nr_to_scan'

 * chunks of ashmem regions LRU-wise one-at-a-time until we hit 'nr_to_scan'

 * pages freed.

 * 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;

	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:

	case ASHMEM_PURGE_ALL_CACHES:

		ret = -EPERM;

		ret = -EPERM;

		if (capable(CAP_SYS_ADMIN)) {

		if (capable(CAP_SYS_ADMIN)) {

			ret = ashmem_shrink(0, GFP_KERNEL);

			ret = ashmem_shrink(&ashmem_shrinker, 0, GFP_KERNEL);

			ashmem_shrink(ret, GFP_KERNEL);

			ashmem_shrink(&ashmem_shrinker, ret, GFP_KERNEL);

		}

		}

		break;

		break;

	}

	}