The patch titled
kthread-numa-aware-kthread_create_on_cpu-update
has been removed from the -mm tree. Its filename was
kthread-numa-aware-kthread_create_on_cpu-update.patch
This patch was dropped because it was folded into kthread-numa-aware-kthread_create_on_cpu.patch
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: kthread-numa-aware-kthread_create_on_cpu-update
From: Eric Dumazet <eric.dumazet@xxxxxxxxx>
People told me kthread_create_on_cpu() was a wrong name and prefer
kthread_create_on_node()
Signed-off-by: Eric Dumazet <eric.dumazet@xxxxxxxxx>
Cc: David Miller <davem@xxxxxxxxxxxxx>
Cc: Andi Kleen <andi@xxxxxxxxxxxxxx>
Cc: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
Cc: Tejun Heo <tj@xxxxxxxxxx>
Cc: linux-arch@xxxxxxxxxxxxxxx
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/kthread.h | 10 +++++-----
kernel/kthread.c | 27 +++++++++++++--------------
2 files changed, 18 insertions(+), 19 deletions(-)
diff -puN include/linux/kthread.h~kthread-numa-aware-kthread_create_on_cpu-update include/linux/kthread.h
--- a/include/linux/kthread.h~kthread-numa-aware-kthread_create_on_cpu-update
+++ a/include/linux/kthread.h
@@ -4,14 +4,14 @@
#include <linux/err.h>
#include <linux/sched.h>
-struct task_struct *kthread_create_on_cpu(int (*threadfn)(void *data),
- void *data,
- int cpu,
- const char namefmt[], ...)
+struct task_struct *kthread_create_on_node(int (*threadfn)(void *data),
+ void *data,
+ int node,
+ const char namefmt[], ...)
__attribute__((format(printf, 4, 5)));
#define kthread_create(threadfn, data, namefmt, arg...) \
- kthread_create_on_cpu(threadfn, data, -1, namefmt, ##arg)
+ kthread_create_on_node(threadfn, data, -1, namefmt, ##arg)
/**
diff -puN kernel/kthread.c~kthread-numa-aware-kthread_create_on_cpu-update kernel/kthread.c
--- a/kernel/kthread.c~kthread-numa-aware-kthread_create_on_cpu-update
+++ a/kernel/kthread.c
@@ -27,7 +27,7 @@ struct kthread_create_info
/* Information passed to kthread() from kthreadd. */
int (*threadfn)(void *data);
void *data;
- int cpu;
+ int node;
/* Result passed back to kthread_create() from kthreadd. */
struct task_struct *result;
@@ -114,8 +114,7 @@ static void create_kthread(struct kthrea
int pid;
#ifdef CONFIG_NUMA
- current->pref_node_fork = (create->cpu != -1) ?
- cpu_to_node(create->cpu) : -1;
+ current->pref_node_fork = create->node;
#endif
/* We want our own signal handler (we take no signals by default). */
pid = kernel_thread(kthread, create, CLONE_FS | CLONE_FILES | SIGCHLD);
@@ -126,18 +125,18 @@ static void create_kthread(struct kthrea
}
/**
- * kthread_create_on_cpu - create a kthread.
+ * kthread_create_on_node - create a kthread.
* @threadfn: the function to run until signal_pending(current).
* @data: data ptr for @threadfn.
- * @cpu: cpu number.
+ * @node: memory node number.
* @namefmt: printf-style name for the thread.
*
* Description: This helper function creates and names a kernel
* thread. The thread will be stopped: use wake_up_process() to start
* it. See also kthread_run().
*
- * If thread is going to be bound on a particular cpu, give its number
- * in @cpu, to get NUMA affinity for kthread stack, or else give -1.
+ * If thread is going to be bound on a particular cpu, give its node
+ * in @node, to get NUMA affinity for kthread stack, or else give -1.
* When woken, the thread will run @threadfn() with @data as its
* argument. @threadfn() can either call do_exit() directly if it is a
* standalone thread for which noone will call kthread_stop(), or
@@ -147,17 +146,17 @@ static void create_kthread(struct kthrea
*
* Returns a task_struct or ERR_PTR(-ENOMEM).
*/
-struct task_struct *kthread_create_on_cpu(int (*threadfn)(void *data),
- void *data,
- int cpu,
- const char namefmt[],
- ...)
+struct task_struct *kthread_create_on_node(int (*threadfn)(void *data),
+ void *data,
+ int node,
+ const char namefmt[],
+ ...)
{
struct kthread_create_info create;
create.threadfn = threadfn;
create.data = data;
- create.cpu = cpu;
+ create.node = node;
init_completion(&create.done);
spin_lock(&kthread_create_lock);
@@ -184,7 +183,7 @@ struct task_struct *kthread_create_on_cp
}
return create.result;
}
-EXPORT_SYMBOL(kthread_create_on_cpu);
+EXPORT_SYMBOL(kthread_create_on_node);
/**
* kthread_bind - bind a just-created kthread to a cpu.
_
Patches currently in -mm which might be from eric.dumazet@xxxxxxxxx are
origin.patch
mm-numa-aware-alloc_task_struct_node.patch
mm-numa-aware-alloc_thread_info_node.patch
kthread-numa-aware-kthread_create_on_cpu.patch
kthread-use-kthread_create_on_cpu.patch
kthread-use-kthread_create_on_cpu-update.patch
net-convert-%p-usage-to-%pk.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
