From: Hugh Dickins <hugh@veritas.com>

Fix #ifndef CONFIG_NUMA build warning on shmem_parse_mpol arising from
mempolicy-support-optional-mode-flags.patch

Signed-off-by: Hugh Dickins <hugh@veritas.com>
Cc: Paul Jackson <pj@sgi.com>
Cc: Christoph Lameter <clameter@sgi.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
Cc: Andi Kleen <ak@suse.de>
Cc: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 mm/shmem.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN mm/shmem.c~mempolicy-support-optional-mode-flags-fix mm/shmem.c
--- a/mm/shmem.c~mempolicy-support-optional-mode-flags-fix
+++ a/mm/shmem.c
@@ -1204,7 +1204,7 @@ static struct page *shmem_alloc_page(gfp
 #else /* !CONFIG_NUMA */
 #ifdef CONFIG_TMPFS
 static inline int shmem_parse_mpol(char *value, unsigned short *policy,
-				unsigned short flags, nodemask_t *policy_nodes)
+			unsigned short *mode_flags, nodemask_t *policy_nodes)
 {
 	return 1;
 }
_