---

yaml --- r: 164479 b: refs/heads/master c: 3f96b79 h: refs/heads/master i: 164477: 6d048be 164475: 8400266 164471: f1ae49a 164463: f773c7b 164447: 2f36e9a 164415: 2100486 164351: 32bac53 v: v3
git-mirror · Sep 22, 2009 · 59b3f16 · 59b3f16
1 parent 68ef852
commit 59b3f16
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cdf7b3418ad5a8783efe8f9124023d9b869fec0f
+refs/heads/master: 3f96b79ad96263cc0ece7bb340cddf9b2ddfb1b3
diff --git a/trunk/fs/Kconfig b/trunk/fs/Kconfig
@@ -109,6 +109,7 @@ source "fs/sysfs/Kconfig"
 
 config TMPFS
 	bool "Virtual memory file system support (former shm fs)"
+	depends on SHMEM
 	help
 	  Tmpfs is a file system which keeps all files in virtual memory.
 

diff --git a/trunk/include/linux/mm.h b/trunk/include/linux/mm.h
@@ -702,17 +702,8 @@ extern void pagefault_out_of_memory(void);
 
 extern void show_free_areas(void);
 
-#ifdef CONFIG_SHMEM
-extern int shmem_lock(struct file *file, int lock, struct user_struct *user);
-#else
-static inline int shmem_lock(struct file *file, int lock,
-			    struct user_struct *user)
-{
-	return 0;
-}
-#endif
+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);
-
 int shmem_zero_setup(struct vm_area_struct *);
 
 #ifndef CONFIG_MMU

diff --git a/trunk/mm/shmem.c b/trunk/mm/shmem.c
@@ -2593,6 +2593,11 @@ int shmem_unuse(swp_entry_t entry, struct page *page)
 	return 0;
 }
 
+int shmem_lock(struct file *file, int lock, struct user_struct *user)
+{
+	return 0;
+}
+
 #define shmem_vm_ops				generic_file_vm_ops
 #define shmem_file_operations			ramfs_file_operations
 #define shmem_get_inode(sb, mode, dev, flags)	ramfs_get_inode(sb, mode, dev)