aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/android
diff options
context:
space:
mode:
authorLorDClockaN <davor@losinj.com>2014-06-18 15:09:32 +0200
committerLorDClockaN <davor@losinj.com>2014-06-18 15:09:32 +0200
commit3d258ae906ee28e8f43f1fe1f51d48a63b5fd1ca (patch)
treedaf27e2d6c97a18c9525ec3207a6aa6191165a2d /drivers/staging/android
parent69a8edcfd8ca6987626f20cd5a78051f43f532e9 (diff)
parentc795f63b44d1f605b84261bd9a76e53f6f1a0b7d (diff)
Merge branch 'kitkat' of https://github.com/AOKP/kernel_lge_mako into 443HEADkitkat
Change-Id: I1801401160f3216c9e2621b4cb337b3c11d82c9e
Diffstat (limited to 'drivers/staging/android')
-rw-r--r--drivers/staging/android/ashmem.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/staging/android/ashmem.c b/drivers/staging/android/ashmem.c
index 16c411cbe5b..4f13907543e 100644
--- a/drivers/staging/android/ashmem.c
+++ b/drivers/staging/android/ashmem.c
@@ -365,7 +365,9 @@ static int ashmem_shrink(struct shrinker *s, struct shrink_control *sc)
if (!sc->nr_to_scan)
return lru_count;
- mutex_lock(&ashmem_mutex);
+ if (!mutex_trylock(&ashmem_mutex))
+ return -1;
+
list_for_each_entry_safe(range, next, &ashmem_lru_list, lru) {
struct inode *inode = range->asma->file->f_dentry->d_inode;
loff_t start = range->pgstart * PAGE_SIZE;