diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 19:35:11 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 19:35:11 -0400 |
| commit | 708e16892e1646594a29eaa7ac7b209b600b9fd2 (patch) | |
| tree | fe7c31bc0edef84eb1075c7e195340047d6aaa17 /kernel/workqueue.c | |
| parent | f3c87a8999c28f2948ebd407574f7e9fb5c577b2 (diff) | |
| parent | a847825970e741e20a09c659978baa34016b63bc (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (39 commits)
Add missing maintainer countries in CREDITS
Fix bytes <-> kilobytes typo in Kconfig for ramdisk
fix a typo in Documentation/pi-futex.txt
BUG_ON conversion for fs/xfs/
BUG_ON() conversion in fs/nfsd/
BUG_ON conversion for fs/reiserfs
BUG_ON cleanups in arch/i386
BUG_ON cleanup in drivers/net/tokenring/
BUG_ON cleanup for drivers/md/
kerneldoc-typo in led-class.c
debugfs: spelling fix
rcutorture: Fix incorrect description of default for nreaders parameter
parport: Remove space in function calls
Michal Wronski: update contact info
Spelling fix: "control" instead of "cotrol"
reboot parameter in Documentation/kernel-parameters.txt
Fix copy&waste bug in comment in scripts/kernel-doc
remove duplicate "until" from kernel/workqueue.c
ite_gpio fix tabbage
fix file specification in comments
...
Fixed trivial path conflicts due to removed files:
arch/mips/dec/boot/decstation.c, drivers/char/ite_gpio.c
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 835fe28b87a8..cfc737bffe6d 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c | |||
| @@ -34,7 +34,7 @@ | |||
| 34 | * possible cpu). | 34 | * possible cpu). |
| 35 | * | 35 | * |
| 36 | * The sequence counters are for flush_scheduled_work(). It wants to wait | 36 | * The sequence counters are for flush_scheduled_work(). It wants to wait |
| 37 | * until until all currently-scheduled works are completed, but it doesn't | 37 | * until all currently-scheduled works are completed, but it doesn't |
| 38 | * want to be livelocked by new, incoming ones. So it waits until | 38 | * want to be livelocked by new, incoming ones. So it waits until |
| 39 | * remove_sequence is >= the insert_sequence which pertained when | 39 | * remove_sequence is >= the insert_sequence which pertained when |
| 40 | * flush_scheduled_work() was called. | 40 | * flush_scheduled_work() was called. |