Merge branch 'p-ti-linux-3.8.y' into p-ti-android-3.8.y

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

diff --git a/include/linux/mm.h b/include/linux/mm.h
index 66e2f7c61e5c9d3a2924389e28ffa9d32c8728bf..b2b1b1cfc436fddfbe44791207633f5e1f41e6e8 100644 (file)
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -929,6 +929,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);
@@ -1623,6 +1624,8 @@ int vm_insert_pfn(struct vm_area_struct *vma, unsigned long addr,
                        unsigned long pfn);
 int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
                        unsigned long pfn);
+int vm_iomap_memory(struct vm_area_struct *vma, phys_addr_t start, unsigned long len);
+
 
 struct page *follow_page(struct vm_area_struct *, unsigned long address,
                        unsigned int foll_flags);