Merge remote branch 'stable/linux-2.6.35.y' into android-2.6.35

[android-x86/kernel.git] / include / linux / mm.h

diff --git a/include/linux/mm.h b/include/linux/mm.h
index c1f54d2..d70819d 100644 (file)
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -736,6 +736,7 @@ extern void show_free_areas(void);
 
 int shmem_lock(struct file *file, int lock, struct user_struct *user);
 struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags);
+void shmem_set_file(struct vm_area_struct *vma, struct file *file);
 int shmem_zero_setup(struct vm_area_struct *);
 
 #ifndef CONFIG_MMU