diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/md/dm-delay.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/md/dm-delay.c')
| -rw-r--r-- | drivers/md/dm-delay.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/dm-delay.c b/drivers/md/dm-delay.c index baa11912cc94..f18375dcedd9 100644 --- a/drivers/md/dm-delay.c +++ b/drivers/md/dm-delay.c | |||
| @@ -352,7 +352,7 @@ static int __init dm_delay_init(void) | |||
| 352 | { | 352 | { |
| 353 | int r = -ENOMEM; | 353 | int r = -ENOMEM; |
| 354 | 354 | ||
| 355 | kdelayd_wq = create_workqueue("kdelayd"); | 355 | kdelayd_wq = alloc_workqueue("kdelayd", WQ_MEM_RECLAIM, 0); |
| 356 | if (!kdelayd_wq) { | 356 | if (!kdelayd_wq) { |
| 357 | DMERR("Couldn't start kdelayd"); | 357 | DMERR("Couldn't start kdelayd"); |
| 358 | goto bad_queue; | 358 | goto bad_queue; |