Update of /cvsroot/linux-vax/kernel-2.5/drivers/scsi
In directory sc8-pr-cvs1:/tmp/cvs-serv8347a/drivers/scsi
Modified Files:
scsi_merge.c
Removed Files:
i60uscsi.h
Log Message:
Merge with 2.5.25
Index: scsi_merge.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/scsi/scsi_merge.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- scsi_merge.c 25 Jan 2003 00:33:32 -0000 1.7
+++ scsi_merge.c 29 Jan 2003 00:03:39 -0000 1.8
@@ -57,7 +57,7 @@
*/
int scsi_init_io(Scsi_Cmnd *SCpnt)
{
- struct request *req = &SCpnt->request;
+ struct request *req = SCpnt->request;
struct scatterlist *sgpnt;
int count, gfp_mask;
@@ -74,8 +74,10 @@
SCpnt->use_sg = count;
gfp_mask = GFP_NOIO;
- if (in_interrupt())
+ if (in_interrupt()) {
gfp_mask &= ~__GFP_WAIT;
+ gfp_mask |= __GFP_HIGH;
+ }
/*
* if sg table allocation fails, requeue request later.
--- i60uscsi.h DELETED ---
|
