diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-06 04:11:46 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-06 04:11:46 -0500 |
| commit | 90b4d60c6103105a634c495003c2ce931f075f63 (patch) | |
| tree | 033f07fb175a5e0651f6a63fc0fe8e1860555ce5 /kernel/workqueue.c | |
| parent | bac91462e8a8609d7be02a2cbf5c2b406b04ed9f (diff) | |
| parent | 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64 (diff) | |
Merge tag 'v3.7-rc3' into HEAD
Linux 3.7-rc3
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 d951daa0ca9a..042d221d33cc 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c | |||
| @@ -2982,7 +2982,7 @@ bool cancel_delayed_work(struct delayed_work *dwork) | |||
| 2982 | 2982 | ||
| 2983 | set_work_cpu_and_clear_pending(&dwork->work, work_cpu(&dwork->work)); | 2983 | set_work_cpu_and_clear_pending(&dwork->work, work_cpu(&dwork->work)); |
| 2984 | local_irq_restore(flags); | 2984 | local_irq_restore(flags); |
| 2985 | return true; | 2985 | return ret; |
| 2986 | } | 2986 | } |
| 2987 | EXPORT_SYMBOL(cancel_delayed_work); | 2987 | EXPORT_SYMBOL(cancel_delayed_work); |
| 2988 | 2988 | ||