diff options
author | Kevin Hilman <khilman@linaro.org> | 2015-08-14 10:33:21 -0700 |
---|---|---|
committer | Kevin Hilman <khilman@linaro.org> | 2015-08-14 10:33:21 -0700 |
commit | 59255ac55ba6ecd195ef97c6bcd1303a7f838c94 (patch) | |
tree | c21899d772e8b55b74c9943f48ae88d3bd8724c9 /drivers/md/dm.c | |
parent | 9106e24eb8e4dbe7f8de197317e68624ada540b0 (diff) | |
parent | 07818b5b1ba0f494a7255ab634bad2dd2b908ed0 (diff) |
Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-rtlsk-v3.10-15.08-rt
Diffstat (limited to 'drivers/md/dm.c')
-rw-r--r-- | drivers/md/dm.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/md/dm.c b/drivers/md/dm.c index 9fb25377f251..a1925e2ec05c 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -1915,8 +1915,7 @@ static struct mapped_device *alloc_dev(int minor) add_disk(md->disk); format_dev_t(md->name, MKDEV(_major, minor)); - md->wq = alloc_workqueue("kdmflush", - WQ_NON_REENTRANT | WQ_MEM_RECLAIM, 0); + md->wq = alloc_workqueue("kdmflush", WQ_MEM_RECLAIM, 0); if (!md->wq) goto bad_thread; |