summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2004-09-02 20:20:35 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-09-02 20:20:35 -0700
commit49f46c6fe08e3c9267670cb133afeb4447fb8b5c (patch)
treea3f5aceec9d3128ff2ddf977e079e8355618f1e1 /include/linux
parent290e9d2e539ab100048e959cb48f0607a1e75b95 (diff)
[PATCH] Fix shmem.c stubs
Fix the build with CONFIG_SHMEM=n Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/mm.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 397236df3894..65ff5b5e896a 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -528,9 +528,9 @@ struct mempolicy *shmem_get_policy(struct vm_area_struct *vma,
int shmem_lock(struct file *file, int lock, struct user_struct *user);
#else
#define shmem_nopage filemap_nopage
-#define shmem_lock(a, b) /* always in memory, no need to lock */
-#define shmem_set_policy(a, b) (0)
-#define shmem_get_policy(a, b) (NULL)
+#define shmem_lock(a, b, c) ({0;}) /* always in memory, no need to lock */
+#define shmem_set_policy(a, b) (0)
+#define shmem_get_policy(a, b) (NULL)
#endif
struct file *shmem_file_setup(char *name, loff_t size, unsigned long flags);