patch-2.3.14 linux/drivers/scsi/mac_NCR5380.c

• Lines: 12
• Date: Wed Aug 18 10:00:52 1999
• Orig file: v2.3.13/linux/drivers/scsi/mac_NCR5380.c
• Orig date: Fri Jan 15 14:41:04 1999

diff -u --recursive --new-file v2.3.13/linux/drivers/scsi/mac_NCR5380.c linux/drivers/scsi/mac_NCR5380.c
@@ -490,9 +490,9 @@
     int		  cnt = 1;
 #endif
 
-    for (endaddr = VTOP(cmd->SCp.ptr + cmd->SCp.this_residual - 1) + 1;
+    for (endaddr = virt_to_phys(cmd->SCp.ptr + cmd->SCp.this_residual - 1) + 1;
 	 cmd->SCp.buffers_residual &&
-	 VTOP(cmd->SCp.buffer[1].address) == endaddr; ) {
+	 virt_to_phys(cmd->SCp.buffer[1].address) == endaddr; ) {
 	
 	MER_PRINTK("VTOP(%p) == %08lx -> merging\n",
 		   cmd->SCp.buffer[1].address, endaddr);