Merge git://git.kernel.org/pub/scm/linux/kernel/git/jk/spufs

[linux-2.6-omap-h63xx.git] / include / linux / ramfs.h

diff --git a/include/linux/ramfs.h b/include/linux/ramfs.h
index e0a4faa9610cf5d4fe53b7812e1f4a7f28af8787..b160fb18e8d6ce6f724827fe19fd31dfe748ddb8 100644 (file)
--- a/include/linux/ramfs.h
+++ b/include/linux/ramfs.h
@@ -2,10 +2,21 @@
 #define _LINUX_RAMFS_H
 
 struct inode *ramfs_get_inode(struct super_block *sb, int mode, dev_t dev);
-struct super_block *ramfs_get_sb(struct file_system_type *fs_type,
-        int flags, const char *dev_name, void *data);
+extern int ramfs_get_sb(struct file_system_type *fs_type,
+        int flags, const char *dev_name, void *data, struct vfsmount *mnt);
 
-extern struct file_operations ramfs_file_operations;
+#ifndef CONFIG_MMU
+extern unsigned long ramfs_nommu_get_unmapped_area(struct file *file,
+                                                  unsigned long addr,
+                                                  unsigned long len,
+                                                  unsigned long pgoff,
+                                                  unsigned long flags);
+
+extern int ramfs_nommu_mmap(struct file *file, struct vm_area_struct *vma);
+#endif
+
+extern const struct file_operations ramfs_file_operations;
 extern struct vm_operations_struct generic_file_vm_ops;
+extern int __init init_rootfs(void);
 
 #endif