aboutsummaryrefslogtreecommitdiffstats
path: root/mm/shmem.c
diff options
context:
space:
mode:
authorcodeworkx <codeworkx@cyanogenmod.com>2012-09-22 09:48:20 +0200
committercodeworkx <codeworkx@cyanogenmod.com>2012-09-22 14:02:16 +0200
commit2489007e7d740ccbc3e0a202914e243ad5178787 (patch)
treeb8e6380ea7b1da63474ad68a5dba997e01146043 /mm/shmem.c
parent5f67568eb31e3a813c7c52461dcf66ade15fc2e7 (diff)
downloadkernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.zip
kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.gz
kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.bz2
merge opensource jb u5
Change-Id: I1aaec157aa196f3448eff8636134fce89a814cf2
Diffstat (limited to 'mm/shmem.c')
-rw-r--r--mm/shmem.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/mm/shmem.c b/mm/shmem.c
index 883e98f..e76f74e 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -1060,8 +1060,17 @@ static int shmem_writepage(struct page *page, struct writeback_control *wbc)
info = SHMEM_I(inode);
if (info->flags & VM_LOCKED)
goto redirty;
+#ifdef CONFIG_ZRAM_FOR_ANDROID
+ /*
+ * Modification for compcache
+ * shmem_writepage can be reason of kernel panic when using swap.
+ * This modification prevent using swap by shmem.
+ */
+ goto redirty;
+#else
if (!total_swap_pages)
goto redirty;
+#endif
/*
* shmem_backing_dev_info's capabilities prevent regular writeback or