diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-11 07:48:37 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-11 07:48:37 +0200 |
| commit | 1a04392bd6439876b1552793389cbb5be356ea54 (patch) | |
| tree | 12af7b77e3b0848127f2d2871778c9c1f315578a /drivers/s390/scsi/zfcp_aux.c | |
| parent | [libata pdc_adma] license update, minor cleanup (diff) | |
| parent | [PATCH] i386: Don't discard upper 32bits of HWCR on K8 (diff) | |
| download | linux-1a04392bd6439876b1552793389cbb5be356ea54.tar.xz linux-1a04392bd6439876b1552793389cbb5be356ea54.zip | |
Merge branch 'master'
Diffstat (limited to 'drivers/s390/scsi/zfcp_aux.c')
| -rw-r--r-- | drivers/s390/scsi/zfcp_aux.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/scsi/zfcp_aux.c b/drivers/s390/scsi/zfcp_aux.c index 0b5087f7cabc..cab098556b44 100644 --- a/drivers/s390/scsi/zfcp_aux.c +++ b/drivers/s390/scsi/zfcp_aux.c @@ -833,7 +833,7 @@ zfcp_unit_dequeue(struct zfcp_unit *unit) } static void * -zfcp_mempool_alloc(unsigned int __nocast gfp_mask, void *size) +zfcp_mempool_alloc(gfp_t gfp_mask, void *size) { return kmalloc((size_t) size, gfp_mask); } |