From 9f90cc9d16973512702dc77c777cef84fe1d072f Mon Sep 17 00:00:00 2001
From: Stephen Wilson <wilsons@start.ca>
Date: Tue, 24 May 2011 17:12:46 -0700
Subject: [PATCH] --- yaml --- r: 250934 b: refs/heads/master c:
 13057efb0a0063eb8042d99093ec88a52c4f1593 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/include/linux/mempolicy.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 1527542ca466..8d7c39e2396a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9840e37239183a947a15d617c67e418c6e505dd8
+refs/heads/master: 13057efb0a0063eb8042d99093ec88a52c4f1593
diff --git a/trunk/include/linux/mempolicy.h b/trunk/include/linux/mempolicy.h
index c2f603218fbc..7978eec1b7d9 100644
--- a/trunk/include/linux/mempolicy.h
+++ b/trunk/include/linux/mempolicy.h
@@ -231,10 +231,10 @@ int do_migrate_pages(struct mm_struct *mm,
 
 #ifdef CONFIG_TMPFS
 extern int mpol_parse_str(char *str, struct mempolicy **mpol, int no_context);
+#endif
 
 extern int mpol_to_str(char *buffer, int maxlen, struct mempolicy *pol,
 			int no_context);
-#endif
 
 /* Check if a vma is migratable */
 static inline int vma_migratable(struct vm_area_struct *vma)
@@ -371,13 +371,13 @@ static inline int mpol_parse_str(char *str, struct mempolicy **mpol,
 {
 	return 1;	/* error */
 }
+#endif
 
 static inline int mpol_to_str(char *buffer, int maxlen, struct mempolicy *pol,
 				int no_context)
 {
 	return 0;
 }
-#endif
 
 #endif /* CONFIG_NUMA */
 #endif /* __KERNEL__ */