From ff11d791429b412ef1dda17d8240310a27f3a7eb Mon Sep 17 00:00:00 2001
From: Christoph Lameter <clameter@sgi.com>
Date: Wed, 11 Oct 2006 01:21:26 -0700
Subject: [PATCH] --- yaml --- r: 39315 b: refs/heads/master c:
 469340236a7c9673df3e6a2425f559517f01464e h: refs/heads/master i:   39313:
 b27fdf614df7ea61977c33138e91f6f916cf1f61   39311:
 a02022b643caddee9d65edc315b14627fecbdca8 v: v3

---
 [refs]                   | 2 +-
 trunk/kernel/workqueue.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index fdcc30972800..b8bab87cdc6e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc513a333b45f8913d40c8241a0cb61be79e1c60
+refs/heads/master: 469340236a7c9673df3e6a2425f559517f01464e
diff --git a/trunk/kernel/workqueue.c b/trunk/kernel/workqueue.c
index cfc737bffe6d..3df9bfc7ff78 100644
--- a/trunk/kernel/workqueue.c
+++ b/trunk/kernel/workqueue.c
@@ -28,6 +28,7 @@
 #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
@@ -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;