Merge tag 'llvmlinux-for-v3.15' of git://git.linuxfoundation.org/llvmlinux/kernel

[firefly-linux-kernel-4.4.55.git] / kernel / kthread.c

diff --git a/kernel/kthread.c b/kernel/kthread.c
index b5ae3ee860a9a520d1ea78d15ecdb94b75a02cca..9a130ec06f7a5aa38c92f2f7961db6131f43153d 100644 (file)
--- a/kernel/kthread.c
+++ b/kernel/kthread.c
@@ -217,7 +217,7 @@ int tsk_fork_get_node(struct task_struct *tsk)
        if (tsk == kthreadd_task)
                return tsk->pref_node_fork;
 #endif
-       return numa_node_id();
+       return NUMA_NO_NODE;
 }
 
 static void create_kthread(struct kthread_create_info *create)
@@ -369,7 +369,7 @@ struct task_struct *kthread_create_on_cpu(int (*threadfn)(void *data),
 {
        struct task_struct *p;
 
-       p = kthread_create_on_node(threadfn, data, cpu_to_node(cpu), namefmt,
+       p = kthread_create_on_node(threadfn, data, cpu_to_mem(cpu), namefmt,
                                   cpu);
        if (IS_ERR(p))
                return p;