From 83050f6161867fa946d9a9b69aea2c6688128149 Mon Sep 17 00:00:00 2001
From: Neil Brown <neilb@suse.de>
Date: Fri, 2 Sep 2005 13:13:54 +1000
Subject: [PATCH] --- yaml --- r: 8720 b: refs/heads/master c:
 286f3e13a1dc7f32407629fbd7aabc8ea78c62b5 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/scsi/scsi_lib.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index fd57574e27d5..1f700ea5479c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 903f4fed858a7b56b260cbd55d174fe54d188fb7
+refs/heads/master: 286f3e13a1dc7f32407629fbd7aabc8ea78c62b5
diff --git a/trunk/drivers/scsi/scsi_lib.c b/trunk/drivers/scsi/scsi_lib.c
index 77f2d444f7e0..2ad60f1dbc63 100644
--- a/trunk/drivers/scsi/scsi_lib.c
+++ b/trunk/drivers/scsi/scsi_lib.c
@@ -339,7 +339,7 @@ int scsi_execute_req(struct scsi_device *sdev, const unsigned char *cmd,
 	int result;
 	
 	if (sshdr) {
-		sense = kmalloc(SCSI_SENSE_BUFFERSIZE, GFP_KERNEL);
+		sense = kmalloc(SCSI_SENSE_BUFFERSIZE, GFP_NOIO);
 		if (!sense)
 			return DRIVER_ERROR << 24;
 		memset(sense, 0, SCSI_SENSE_BUFFERSIZE);