---

yaml --- r: 16311 b: refs/heads/master c: 03b00eb h: refs/heads/master i: 16309: c54e17a 16307: 0a1aee2 16303: 0d51423 v: v3
git-mirror · Jan 6, 2006 · 2ae512c · 2ae512c
1 parent 00e4d95
commit 2ae512c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a94b3ab7eab4edcc9b2cb474b188f774c331adf7
+refs/heads/master: 03b00ebcc804180829d513df9e92e5fe8f72aacf
diff --git a/trunk/include/linux/mm.h b/trunk/include/linux/mm.h
@@ -634,9 +634,24 @@ 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, c) 	({0;})	/* always in memory, no need to lock */
-#define shmem_set_policy(a, b)	(0)
-#define shmem_get_policy(a, b)	(NULL)
+
+static inline int shmem_lock(struct file *file, int lock,
+			     struct user_struct *user)
+{
+	return 0;
+}
+
+static inline int shmem_set_policy(struct vm_area_struct *vma,
+				   struct mempolicy *new)
+{
+	return 0;
+}
+
+static inline struct mempolicy *shmem_get_policy(struct vm_area_struct *vma,
+						 unsigned long addr)
+{
+	return NULL;
+}
 #endif
 struct file *shmem_file_setup(char *name, loff_t size, unsigned long flags);