diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-10-11 04:29:48 -0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-10-11 04:29:48 -0400 |
| commit | 29d8699ebb1e8948a612306c69e6d9c4ef23342f (patch) | |
| tree | f2378e8d2fbef7fc215a25acf2042b8965109e5e /drivers/md/dm-crypt.c | |
| parent | e9438250b635f7832e99a8c8d2e394dd1522ce65 (diff) | |
| parent | 907a42617970a159361f17ef9a63f04d276995ab (diff) | |
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'drivers/md/dm-crypt.c')
| -rw-r--r-- | drivers/md/dm-crypt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c index b82bc3150476..b6148f6f7836 100644 --- a/drivers/md/dm-crypt.c +++ b/drivers/md/dm-crypt.c | |||
| @@ -96,7 +96,7 @@ static kmem_cache_t *_crypt_io_pool; | |||
| 96 | /* | 96 | /* |
| 97 | * Mempool alloc and free functions for the page | 97 | * Mempool alloc and free functions for the page |
| 98 | */ | 98 | */ |
| 99 | static void *mempool_alloc_page(unsigned int __nocast gfp_mask, void *data) | 99 | static void *mempool_alloc_page(gfp_t gfp_mask, void *data) |
| 100 | { | 100 | { |
| 101 | return alloc_page(gfp_mask); | 101 | return alloc_page(gfp_mask); |
| 102 | } | 102 | } |