From 2ae512c27cb9ed5e1e3ebc02ea160c0bea5b60b9 Mon Sep 17 00:00:00 2001 From: Russell King Date: Fri, 6 Jan 2006 00:10:52 -0800 Subject: [PATCH] --- yaml --- r: 16311 b: refs/heads/master c: 03b00ebcc804180829d513df9e92e5fe8f72aacf h: refs/heads/master i: 16309: c54e17aedacf81812589615b1a36852ea9c4639d 16307: 0a1aee2612aa06556fd2d5247a1d9d5c2b29f92d 16303: 0d51423d06c59bc33d7613939cd6d975c6e3b831 v: v3 --- [refs] | 2 +- trunk/include/linux/mm.h | 21 ++++++++++++++++++--- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index cf999ad16061..88f0407500a9 100644 --- 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 index 6c9be99429f3..75ec04e2f184 100644 --- 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);