X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=kernel%2Fworkqueue.c;h=3df9bfc7ff78fed6215a2d6f138a18a016d7e04a;hb=73441c665bee555526b1cf3eef603a0cff0b7e19;hp=835fe28b87a8325c1cfb691de03dd7e2615ea943;hpb=8ce7a9c159c8c4eb480f0a65c6af753dbf9a1a70;p=linux-2.6

diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 835fe28b87..3df9bfc7ff 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -28,13 +28,14 @@
 #include <linux/notifier.h>
 #include <linux/kthread.h>
 #include <linux/hardirq.h>
+#include <linux/mempolicy.h>
 
 /*
  * The per-CPU workqueue (if single thread, we always use the first
  * possible cpu).
  *
  * The sequence counters are for flush_scheduled_work().  It wants to wait
- * until until all currently-scheduled works are completed, but it doesn't
+ * until all currently-scheduled works are completed, but it doesn't
  * want to be livelocked by new, incoming ones.  So it waits until
  * remove_sequence is >= the insert_sequence which pertained when
  * flush_scheduled_work() was called.
@@ -245,6 +246,12 @@ static int worker_thread(void *__cwq)
 	sigprocmask(SIG_BLOCK, &blocked, NULL);
 	flush_signals(current);
 
+	/*
+	 * We inherited MPOL_INTERLEAVE from the booting kernel.
+	 * Set MPOL_DEFAULT to insure node local allocations.
+	 */
+	numa_default_policy();
+
 	/* SIG_IGN makes children autoreap: see do_notify_parent(). */
 	sa.sa.sa_handler = SIG_IGN;
 	sa.sa.sa_flags = 0;