diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-18 18:30:58 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-18 18:30:58 -0400 |
| commit | 77501f3cb648e18733509a951ed31eddd7ef2c0b (patch) | |
| tree | 82624caa354394df2422562bf6dda56a2c088704 /drivers/md/multipath.c | |
| parent | 422fa08e538b649a9b80258950d2f8a202f45f19 (diff) | |
| parent | 59a10b172fccaea793352c00fd9065f0a5b4ef70 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'drivers/md/multipath.c')
| -rw-r--r-- | drivers/md/multipath.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/multipath.c b/drivers/md/multipath.c index 286342375fb7..1151c3ed3006 100644 --- a/drivers/md/multipath.c +++ b/drivers/md/multipath.c | |||
| @@ -38,7 +38,7 @@ | |||
| 38 | static mdk_personality_t multipath_personality; | 38 | static mdk_personality_t multipath_personality; |
| 39 | 39 | ||
| 40 | 40 | ||
| 41 | static void *mp_pool_alloc(unsigned int __nocast gfp_flags, void *data) | 41 | static void *mp_pool_alloc(gfp_t gfp_flags, void *data) |
| 42 | { | 42 | { |
| 43 | struct multipath_bh *mpb; | 43 | struct multipath_bh *mpb; |
| 44 | mpb = kmalloc(sizeof(*mpb), gfp_flags); | 44 | mpb = kmalloc(sizeof(*mpb), gfp_flags); |