[SCSI] qla2xxx: Change GFP_ATOMIC to GFP_KERNEL for non-atomic allocations.
Both call-sites are sleeping-capable. Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
This commit is contained in:
parent
49fd462a1b
commit
4b89258c73
2 changed files with 2 additions and 2 deletions
|
@ -2561,7 +2561,7 @@ qla2x00_find_all_fabric_devs(scsi_qla_host_t *ha, struct list_head *new_fcports)
|
||||||
rval = QLA_SUCCESS;
|
rval = QLA_SUCCESS;
|
||||||
|
|
||||||
/* Try GID_PT to get device list, else GAN. */
|
/* Try GID_PT to get device list, else GAN. */
|
||||||
swl = kcalloc(MAX_FIBRE_DEVICES, sizeof(sw_info_t), GFP_ATOMIC);
|
swl = kcalloc(MAX_FIBRE_DEVICES, sizeof(sw_info_t), GFP_KERNEL);
|
||||||
if (!swl) {
|
if (!swl) {
|
||||||
/*EMPTY*/
|
/*EMPTY*/
|
||||||
DEBUG2(printk("scsi(%ld): GID_PT allocations failed, fallback "
|
DEBUG2(printk("scsi(%ld): GID_PT allocations failed, fallback "
|
||||||
|
|
|
@ -1995,7 +1995,7 @@ qla2x00_get_fcal_position_map(scsi_qla_host_t *ha, char *pos_map)
|
||||||
char *pmap;
|
char *pmap;
|
||||||
dma_addr_t pmap_dma;
|
dma_addr_t pmap_dma;
|
||||||
|
|
||||||
pmap = dma_pool_alloc(ha->s_dma_pool, GFP_ATOMIC, &pmap_dma);
|
pmap = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &pmap_dma);
|
||||||
if (pmap == NULL) {
|
if (pmap == NULL) {
|
||||||
DEBUG2_3_11(printk("%s(%ld): **** Mem Alloc Failed ****",
|
DEBUG2_3_11(printk("%s(%ld): **** Mem Alloc Failed ****",
|
||||||
__func__, ha->host_no));
|
__func__, ha->host_no));
|
||||||
|
|
Loading…
Add table
Reference in a new issue