Merge branch 'akpm' (patches from Andrew)

[muen/linux.git] / kernel / kthread.c

diff --git a/kernel/kthread.c b/kernel/kthread.c
index 9cf20cc5ebe3e4b56a0e37b4d89f38b95af2cca9..5942eeafb9acfd577768c9e737c91547680449ae 100644 (file)
--- a/kernel/kthread.c
+++ b/kernel/kthread.c
@@ -20,6 +20,7 @@
 #include <linux/freezer.h>
 #include <linux/ptrace.h>
 #include <linux/uaccess.h>
 #include <linux/freezer.h>
 #include <linux/ptrace.h>
 #include <linux/uaccess.h>

+#include <linux/numa.h>

 #include <trace/events/sched.h>
 
 static DEFINE_SPINLOCK(kthread_create_lock);
 #include <trace/events/sched.h>
 
 static DEFINE_SPINLOCK(kthread_create_lock);


@@ -681,7 +682,7 @@ __kthread_create_worker(int cpu, unsigned int flags,
 {
        struct kthread_worker *worker;
        struct task_struct *task;
 {
        struct kthread_worker *worker;
        struct task_struct *task;

-       int node = -1;
+       int node = NUMA_NO_NODE;

 
        worker = kzalloc(sizeof(*worker), GFP_KERNEL);
        if (!worker)
 
        worker = kzalloc(sizeof(*worker), GFP_KERNEL);
        if (!worker)