diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-11 01:48:37 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-11 01:48:37 -0400 |
| commit | 1a04392bd6439876b1552793389cbb5be356ea54 (patch) | |
| tree | 12af7b77e3b0848127f2d2871778c9c1f315578a /drivers/md/dm-io.c | |
| parent | 68399bb5080c1d96f2110b0a040b39d3ccd7a18a (diff) | |
| parent | 3c92c2ba33cd7d666c5f83cc32aa590e794e91b0 (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/md/dm-io.c')
| -rw-r--r-- | drivers/md/dm-io.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/dm-io.c b/drivers/md/dm-io.c index 9de000131a8a..4809b209fbb1 100644 --- a/drivers/md/dm-io.c +++ b/drivers/md/dm-io.c | |||
| @@ -32,7 +32,7 @@ struct io { | |||
| 32 | static unsigned _num_ios; | 32 | static unsigned _num_ios; |
| 33 | static mempool_t *_io_pool; | 33 | static mempool_t *_io_pool; |
| 34 | 34 | ||
| 35 | static void *alloc_io(unsigned int __nocast gfp_mask, void *pool_data) | 35 | static void *alloc_io(gfp_t gfp_mask, void *pool_data) |
| 36 | { | 36 | { |
| 37 | return kmalloc(sizeof(struct io), gfp_mask); | 37 | return kmalloc(sizeof(struct io), gfp_mask); |
| 38 | } | 38 | } |