diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-06-11 17:31:52 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-06-11 17:31:52 -0400 |
| commit | 0d5959723e1db3fd7323c198a50c16cecf96c7a9 (patch) | |
| tree | 802b623fff261ebcbbddadf84af5524398364a18 /kernel/slow-work.c | |
| parent | 62fdac5913f71f8f200bd2c9bd59a02e9a1498e9 (diff) | |
| parent | 512626a04e72aca60effe111fa0333ed0b195d21 (diff) | |
Merge branch 'linus' into x86/mce3
Conflicts:
arch/x86/kernel/cpu/mcheck/mce_64.c
arch/x86/kernel/irq.c
Merge reason: Resolve the conflicts above.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/slow-work.c')
| -rw-r--r-- | kernel/slow-work.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/slow-work.c b/kernel/slow-work.c index b28d19135f43..521ed2004d63 100644 --- a/kernel/slow-work.c +++ b/kernel/slow-work.c | |||
| @@ -372,8 +372,8 @@ static int slow_work_thread(void *_data) | |||
| 372 | vsmax *= atomic_read(&slow_work_thread_count); | 372 | vsmax *= atomic_read(&slow_work_thread_count); |
| 373 | vsmax /= 100; | 373 | vsmax /= 100; |
| 374 | 374 | ||
| 375 | prepare_to_wait(&slow_work_thread_wq, &wait, | 375 | prepare_to_wait_exclusive(&slow_work_thread_wq, &wait, |
| 376 | TASK_INTERRUPTIBLE); | 376 | TASK_INTERRUPTIBLE); |
| 377 | if (!freezing(current) && | 377 | if (!freezing(current) && |
| 378 | !slow_work_threads_should_exit && | 378 | !slow_work_threads_should_exit && |
| 379 | !slow_work_available(vsmax) && | 379 | !slow_work_available(vsmax) && |