diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-04-13 18:32:13 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-04-13 18:32:13 -0400 |
| commit | a84bd2ee81ea1bdbd238cd1c380ec25f50a876c5 (patch) | |
| tree | ba054d4b1a20dadec088fd4d8983fb5939227e46 /kernel/workqueue.c | |
| parent | aec995900fbc8cffa9f0f9e797ef07a0beb2b079 (diff) | |
| parent | 7db6a7fa09884b34d2a5d4e6e4ed58664a5f0cf8 (diff) | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into fixes
Diffstat (limited to 'kernel/workqueue.c')
| -rw-r--r-- | kernel/workqueue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 04ef830690ec..8859a41806dd 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c | |||
| @@ -1291,7 +1291,7 @@ __acquires(&gcwq->lock) | |||
| 1291 | return true; | 1291 | return true; |
| 1292 | spin_unlock_irq(&gcwq->lock); | 1292 | spin_unlock_irq(&gcwq->lock); |
| 1293 | 1293 | ||
| 1294 | /* CPU has come up inbetween, retry migration */ | 1294 | /* CPU has come up in between, retry migration */ |
| 1295 | cpu_relax(); | 1295 | cpu_relax(); |
| 1296 | } | 1296 | } |
| 1297 | } | 1297 | } |