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.h | |
| 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.h')
| -rw-r--r-- | drivers/md/dm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/dm.h b/drivers/md/dm.h index 0c2dd5f4af76..1aaf16746da8 100644 --- a/drivers/md/dm.h +++ b/drivers/md/dm.h | |||
| @@ -149,7 +149,7 @@ void dm_kcopyd_exit(void); | |||
| 149 | /* | 149 | /* |
| 150 | * Mempool operations | 150 | * Mempool operations |
| 151 | */ | 151 | */ |
| 152 | struct dm_md_mempools *dm_alloc_md_mempools(unsigned type); | 152 | struct dm_md_mempools *dm_alloc_md_mempools(unsigned type, unsigned integrity); |
| 153 | void dm_free_md_mempools(struct dm_md_mempools *pools); | 153 | void dm_free_md_mempools(struct dm_md_mempools *pools); |
| 154 | 154 | ||
| 155 | #endif | 155 | #endif |