diff --git a/[refs] b/[refs] index 101a94fcc338..fcaac67e18ae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f02ae73aaa4f285199683862ac59972877a11c5d +refs/heads/master: ac6104cdf87cc162b0a0d78280d1dcb9752e25bb diff --git a/trunk/kernel/workqueue.c b/trunk/kernel/workqueue.c index 2c5073214774..a8b86f7b6e34 100644 --- a/trunk/kernel/workqueue.c +++ b/trunk/kernel/workqueue.c @@ -1707,7 +1707,8 @@ static struct worker *create_worker(struct worker_pool *pool) "kworker/%d:%d%s", pool->cpu, id, pri); else worker->task = kthread_create(worker_thread, worker, - "kworker/u:%d%s", id, pri); + "kworker/u%d:%d%s", + pool->id, id, pri); if (IS_ERR(worker->task)) goto fail;