diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-10-30 16:16:56 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-10-30 16:16:56 -0400 |
| commit | f1e095f1d206b81b44160f41278ce5c78641e9b7 (patch) | |
| tree | bd293d46d2d3e4cdf435a22ddb2877c6ba1b8acc /include/linux/workqueue.h | |
| parent | b0438a1b71955c425c304a2a483765ef24841766 (diff) | |
| parent | 1792f17b7210280a3d7ff29da9614ba779cfcedb (diff) | |
Merge branch 'master' into for-next
Diffstat (limited to 'include/linux/workqueue.h')
| -rw-r--r-- | include/linux/workqueue.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h index 070bb7a88936..0c0771f06bfa 100644 --- a/include/linux/workqueue.h +++ b/include/linux/workqueue.h | |||
| @@ -190,7 +190,7 @@ static inline unsigned int work_static(struct work_struct *work) { return 0; } | |||
| 190 | __INIT_WORK((_work), (_func), 0); \ | 190 | __INIT_WORK((_work), (_func), 0); \ |
| 191 | } while (0) | 191 | } while (0) |
| 192 | 192 | ||
| 193 | #define INIT_WORK_ON_STACK(_work, _func) \ | 193 | #define INIT_WORK_ONSTACK(_work, _func) \ |
| 194 | do { \ | 194 | do { \ |
| 195 | __INIT_WORK((_work), (_func), 1); \ | 195 | __INIT_WORK((_work), (_func), 1); \ |
| 196 | } while (0) | 196 | } while (0) |
| @@ -201,9 +201,9 @@ static inline unsigned int work_static(struct work_struct *work) { return 0; } | |||
| 201 | init_timer(&(_work)->timer); \ | 201 | init_timer(&(_work)->timer); \ |
| 202 | } while (0) | 202 | } while (0) |
| 203 | 203 | ||
| 204 | #define INIT_DELAYED_WORK_ON_STACK(_work, _func) \ | 204 | #define INIT_DELAYED_WORK_ONSTACK(_work, _func) \ |
| 205 | do { \ | 205 | do { \ |
| 206 | INIT_WORK_ON_STACK(&(_work)->work, (_func)); \ | 206 | INIT_WORK_ONSTACK(&(_work)->work, (_func)); \ |
| 207 | init_timer_on_stack(&(_work)->timer); \ | 207 | init_timer_on_stack(&(_work)->timer); \ |
| 208 | } while (0) | 208 | } while (0) |
| 209 | 209 | ||