cpusets-stall-when-updating-mems_allowed-for-mempolicy-or-disjoint-nodemask-fix-2...

Cc: David Rientjes <rientjes@google.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Miao Xie <miaox@cn.fujitsu.com>
Cc: Paul Menage <paul@paulmenage.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h
index d2589e298215864aa7d37d5ccbb6461f6542abfb..7978eec1b7d9964420c2e854afba51a8f9cbf8f5 100644 (file)
--- a/include/linux/mempolicy.h
+++ b/include/linux/mempolicy.h
@@ -253,11 +253,6 @@ static inline int vma_migratable(struct vm_area_struct *vma)
        return 1;
 }
 
-static inline bool task_has_mempolicy(struct task_struct *task)
-{
-       return task->mempolicy;
-}
-
 #else
 
 struct mempolicy {};
@@ -384,11 +379,6 @@ static inline int mpol_to_str(char *buffer, int maxlen, struct mempolicy *pol,
        return 0;
 }
 
-static inline bool task_has_mempolicy(struct task_struct *task)
-{
-       return false;
-}
-
 #endif /* CONFIG_NUMA */
 #endif /* __KERNEL__ */
 

diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index adc395481813532efe82dced222e79115b075b0e..2ba25d5b23e51b5b64f8dd5c380d86b70a8d8d39 100644 (file)
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -137,6 +137,18 @@ static const struct mempolicy_operations {
                        enum mpol_rebind_step step);
 } mpol_ops[MPOL_MAX];
 
+#ifdef CONFIG_NUMA
+static inline bool task_has_mempolicy(struct task_struct *task)
+{
+       return task->mempolicy;
+}
+#else
+static inline bool task_has_mempolicy(struct task_struct *task)
+{
+       return false;
+}
+#endif
+
 /* Check that the nodemask contains at least one populated zone */
 static int is_valid_nodemask(const nodemask_t *nodemask)
 {