summaryrefslogtreecommitdiffstats
path: root/include/linux/mm.h
diff options
context:
space:
mode:
authorRussell King <rmk@arm.linux.org.uk>2006-01-06 00:10:52 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-06 08:33:24 -0800
commit03b00ebcc804180829d513df9e92e5fe8f72aacf (patch)
tree6ffa5de42322cca4b1823f7257647e70a4a166bb /include/linux/mm.h
parenta94b3ab7eab4edcc9b2cb474b188f774c331adf7 (diff)
downloadblackbird-op-linux-03b00ebcc804180829d513df9e92e5fe8f72aacf.tar.gz
blackbird-op-linux-03b00ebcc804180829d513df9e92e5fe8f72aacf.zip
[PATCH] Shut up warnings in ipc/shm.c
Fix two warnings in ipc/shm.c ipc/shm.c:122: warning: statement with no effect ipc/shm.c:560: warning: statement with no effect by converting the macros to empty inline functions. For safety, let's do all three. This also has the advantage that typechecking gets performed even without CONFIG_SHMEM enabled. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Cc: Manfred Spraul <manfred@colorfullife.com> Cc: Hugh Dickins <hugh@veritas.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux/mm.h')
-rw-r--r--include/linux/mm.h21
1 files changed, 18 insertions, 3 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 6c9be99429f3..75ec04e2f184 100644
--- a/include/linux/mm.h
+++ b/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);
OpenPOWER on IntegriCloud