---

yaml --- r: 262320 b: refs/heads/master c: 41ffe5d h: refs/heads/master v: v3
git-mirror · Aug 4, 2011 · d2a5e54 · d2a5e54
1 parent 49b7f49
commit d2a5e54
Show file tree

Hide file tree

Showing 4 changed files with 110 additions and 112 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 285b2c4fdd69ea73b4762785d8c6be83b6c074a6
+refs/heads/master: 41ffe5d5ceef7f7ff2ff18e320d88ca6d629efaf
diff --git a/trunk/include/linux/shmem_fs.h b/trunk/include/linux/shmem_fs.h
@@ -47,7 +47,7 @@ static inline struct shmem_inode_info *SHMEM_I(struct inode *inode)
 /*
  * Functions in mm/shmem.c called directly from elsewhere:
  */
-extern int init_tmpfs(void);
+extern int shmem_init(void);
 extern int shmem_fill_super(struct super_block *sb, void *data, int silent);
 extern struct file *shmem_file_setup(const char *name,
 					loff_t size, unsigned long flags);

diff --git a/trunk/init/main.c b/trunk/init/main.c
@@ -715,7 +715,7 @@ static void __init do_basic_setup(void)
 {
 	cpuset_init_smp();
 	usermodehelper_init();
-	init_tmpfs();
+	shmem_init();
 	driver_init();
 	init_irq_proc();
 	do_ctors();