diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-04-07 06:28:00 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-04-07 06:28:00 -0400 |
| commit | c38f62b08d800104fa9b0e9d6e9141459986c06d (patch) | |
| tree | 1d04d768c8aa0c1a544d1f068317c7beb0101be2 /include/linux/workqueue.h | |
| parent | 250f32747e62cb415b85083e247184188f24e566 (diff) | |
| parent | 8abe05c6eb358967f16bce8a02c88d57c82cfbd6 (diff) | |
Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: fixes for 3.4
A bunch of driver-specific fixes and one generic fix for the new support
for platform DAPM contexts - we were picking the wrong default for the
idle_bias_off setting which was meaning we weren't actually achieving
any useful runtime PM on platform devices.
Diffstat (limited to 'include/linux/workqueue.h')
| -rw-r--r-- | include/linux/workqueue.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h index eb8b9f15f2e0..af155450cabb 100644 --- a/include/linux/workqueue.h +++ b/include/linux/workqueue.h | |||
| @@ -289,12 +289,16 @@ enum { | |||
| 289 | * | 289 | * |
| 290 | * system_freezable_wq is equivalent to system_wq except that it's | 290 | * system_freezable_wq is equivalent to system_wq except that it's |
| 291 | * freezable. | 291 | * freezable. |
| 292 | * | ||
| 293 | * system_nrt_freezable_wq is equivalent to system_nrt_wq except that | ||
| 294 | * it's freezable. | ||
| 292 | */ | 295 | */ |
| 293 | extern struct workqueue_struct *system_wq; | 296 | extern struct workqueue_struct *system_wq; |
| 294 | extern struct workqueue_struct *system_long_wq; | 297 | extern struct workqueue_struct *system_long_wq; |
| 295 | extern struct workqueue_struct *system_nrt_wq; | 298 | extern struct workqueue_struct *system_nrt_wq; |
| 296 | extern struct workqueue_struct *system_unbound_wq; | 299 | extern struct workqueue_struct *system_unbound_wq; |
| 297 | extern struct workqueue_struct *system_freezable_wq; | 300 | extern struct workqueue_struct *system_freezable_wq; |
| 301 | extern struct workqueue_struct *system_nrt_freezable_wq; | ||
| 298 | 302 | ||
| 299 | extern struct workqueue_struct * | 303 | extern struct workqueue_struct * |
| 300 | __alloc_workqueue_key(const char *fmt, unsigned int flags, int max_active, | 304 | __alloc_workqueue_key(const char *fmt, unsigned int flags, int max_active, |
