diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-08 20:51:13 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-08 20:51:13 +0100 |
| commit | 9f93585fdfd34a6fcbad16c0f1e031492df63ad1 (patch) | |
| tree | 6050c4d21c53ea1f88d79f68e060a075a5a343a6 /include | |
| parent | Merge tag 'firewire-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/i... (diff) | |
| parent | firewire: don't use PREPARE_DELAYED_WORK (diff) | |
| download | linux-9f93585fdfd34a6fcbad16c0f1e031492df63ad1.tar.xz linux-9f93585fdfd34a6fcbad16c0f1e031492df63ad1.zip | |
Merge branch 'for-3.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
Pull workqueue fix from Tejun Heo:
"This pull request contains a workqueue usage fix for firewire.
For quite a long time now, workqueue only treats two work items
identical iff both their addresses and callbacks match. This is to
avoid introducing false dependency through the work item being
recycled while being executed. This changes non-reentrancy guarantee
for the users of PREPARE[_DELAYED]_WORK() - if the function changes,
reentrancy isn't guaranteed against the previous instance. Firewire
depended on such nonreentrancy guarantee.
This is fixed by doing the work item multiplexing from firewire proper
while keeping the work function unchanged"
* 'for-3.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
firewire: don't use PREPARE_DELAYED_WORK
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/firewire.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/firewire.h b/include/linux/firewire.h index 5d7782e42b8f..c3683bdf28fe 100644 --- a/include/linux/firewire.h +++ b/include/linux/firewire.h @@ -200,6 +200,7 @@ struct fw_device { unsigned irmc:1; unsigned bc_implemented:2; + work_func_t workfn; struct delayed_work work; struct fw_attribute_group attribute_group; }; |