aboutsummaryrefslogtreecommitdiff
path: root/include/linux/mm.h
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-08-11 11:55:56 +0100
committerMark Brown <broonie@linaro.org>2013-08-11 11:55:56 +0100
commite9b3bd248b349433215cf01064a866b632fb3f4b (patch)
tree9821327345bdced3d895723cba1181d7ca399aca /include/linux/mm.h
parent8bb495e3f02401ee6f76d1b1d77f3ac9f079e376 (diff)
parent80475b849b90d8bed1fe768c496280f4b5c11410 (diff)
Merge branch 'linaro-fixes/experimental/android-3.10' of git://git.linaro.org/people/jstultz/android into lsk-v3.10-jstultz
Diffstat (limited to 'include/linux/mm.h')
-rw-r--r--include/linux/mm.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h
index e0c8528a41a..bd5679ddcd3 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -908,6 +908,7 @@ extern void pagefault_out_of_memory(void);
extern void show_free_areas(unsigned int flags);
extern bool skip_free_areas_node(unsigned int flags, int nid);
+void shmem_set_file(struct vm_area_struct *vma, struct file *file);
int shmem_zero_setup(struct vm_area_struct *);
extern int can_do_mlock(void);