diff options
Diffstat (limited to 'kernel/workqueue.c')
-rw-r--r-- | kernel/workqueue.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 0668795d8818..addfe2df93b1 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c | |||
@@ -317,8 +317,6 @@ static int worker_thread(void *__cwq) | |||
317 | if (cwq->wq->freezeable) | 317 | if (cwq->wq->freezeable) |
318 | set_freezable(); | 318 | set_freezable(); |
319 | 319 | ||
320 | set_user_nice(current, -5); | ||
321 | |||
322 | for (;;) { | 320 | for (;;) { |
323 | prepare_to_wait(&cwq->more_work, &wait, TASK_INTERRUPTIBLE); | 321 | prepare_to_wait(&cwq->more_work, &wait, TASK_INTERRUPTIBLE); |
324 | if (!freezing(current) && | 322 | if (!freezing(current) && |
@@ -600,7 +598,12 @@ static struct workqueue_struct *keventd_wq __read_mostly; | |||
600 | * schedule_work - put work task in global workqueue | 598 | * schedule_work - put work task in global workqueue |
601 | * @work: job to be done | 599 | * @work: job to be done |
602 | * | 600 | * |
603 | * This puts a job in the kernel-global workqueue. | 601 | * Returns zero if @work was already on the kernel-global workqueue and |
602 | * non-zero otherwise. | ||
603 | * | ||
604 | * This puts a job in the kernel-global workqueue if it was not already | ||
605 | * queued and leaves it in the same position on the kernel-global | ||
606 | * workqueue otherwise. | ||
604 | */ | 607 | */ |
605 | int schedule_work(struct work_struct *work) | 608 | int schedule_work(struct work_struct *work) |
606 | { | 609 | { |