Signed-off-by: Rob Evers <revers@xxxxxxxxxx>
---
drivers/scsi/scsi_scan.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 671ff58..1d41730 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -1419,7 +1419,7 @@ static int scsi_report_lun_scan(struct scsi_target *starget, int bflags,
length = (max_scsi_report_luns + 1) *
sizeof(struct scsi_lun);
- first_lun_data = kmalloc(length, GFP_ATOMIC |
+ first_lun_data = kmalloc(length, GFP_KERNEL |
(sdev->host->unchecked_isa_dma ?
__GFP_DMA : 0));
if (!first_lun_data) {
@@ -1463,7 +1463,7 @@ static int scsi_report_lun_scan(struct scsi_target *starget, int bflags,
* add one for the header
*/
length = length + sizeof(struct scsi_lun);
- second_lun_data = kmalloc(length, GFP_ATOMIC |
+ second_lun_data = kmalloc(length, GFP_KERNEL |
(sdev->host->unchecked_isa_dma ?
__GFP_DMA : 0));
if (!second_lun_data) {
--
1.7.11.7
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
