Commit 4b89258c authored by Andrew Vasquez's avatar Andrew Vasquez Committed by James Bottomley
Browse files

[SCSI] qla2xxx: Change GFP_ATOMIC to GFP_KERNEL for non-atomic allocations. 



Both call-sites are sleeping-capable.

Signed-off-by: default avatarAndrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 49fd462a

drivers/scsi/qla2xxx/qla_init.c

+1 −1
Original line number Diff line number Diff line
@@ -2561,7 +2561,7 @@ qla2x00_find_all_fabric_devs(scsi_qla_host_t *ha, struct list_head *new_fcports) 
	rval = QLA_SUCCESS;



	/* 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) {

		/*EMPTY*/

		DEBUG2(printk("scsi(%ld): GID_PT allocations failed, fallback "

drivers/scsi/qla2xxx/qla_mbx.c

+1 −1
Original line number Diff line number Diff line
@@ -1995,7 +1995,7 @@ qla2x00_get_fcal_position_map(scsi_qla_host_t *ha, char *pos_map) 
	char *pmap;

	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) {

		DEBUG2_3_11(printk("%s(%ld): **** Mem Alloc Failed ****",

		    __func__, ha->host_no));

CRA Git | Maintained and supported by SUSTech CRA and CCSE