X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=mm%2Fmempolicy.c;h=08f40a2f3fe0aef1819636d5983b3242758463e9;hb=a52116aba5b3eed0ee41f70b794cc1937acd5cb8;hp=6cdfa1df57f6d38dc2b1a7e319670cd288ce5b46;hpb=926f2ae04f183098cf9a30521776fb2759c8afeb;p=safe%2Fjmp%2Flinux-2.6

diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index 6cdfa1d..08f40a2 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -73,7 +73,6 @@
 #include <linux/sched.h>
 #include <linux/nodemask.h>
 #include <linux/cpuset.h>
-#include <linux/gfp.h>
 #include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/module.h>
@@ -806,9 +805,13 @@ static long do_get_mempolicy(int *policy, nodemask_t *nmask,
 
 	err = 0;
 	if (nmask) {
-		task_lock(current);
-		get_policy_nodemask(pol, nmask);
-		task_unlock(current);
+		if (mpol_store_user_nodemask(pol)) {
+			*nmask = pol->w.user_nodemask;
+		} else {
+			task_lock(current);
+			get_policy_nodemask(pol, nmask);
+			task_unlock(current);
+		}
 	}
 
  out: