patch-2.1.42 linux/drivers/scsi/scsi.h

• Lines: 17
• Date: Thu May 29 08:35:07 1997
• Orig file: v2.1.41/linux/drivers/scsi/scsi.h
• Orig date: Sat May 24 09:10:24 1997

diff -u --recursive --new-file v2.1.41/linux/drivers/scsi/scsi.h linux/drivers/scsi/scsi.h
@@ -24,6 +24,7 @@
 #include <linux/random.h>
 
 #include <asm/hardirq.h>
+#include <asm/io.h>
 
 /*
  * Some defs, in case these are not defined elsewhere.
@@ -221,7 +222,7 @@
 #ifdef __mc68000__
 #include <asm/pgtable.h>
 #define CONTIGUOUS_BUFFERS(X,Y) \
-	(VTOP((X)->b_data+(X)->b_size-1)+1 == VTOP((Y)->b_data))
+	(virt_to_phys((X)->b_data+(X)->b_size-1)+1==virt_to_phys((Y)->b_data))
 #else
 #define CONTIGUOUS_BUFFERS(X,Y) ((X->b_data+X->b_size) == Y->b_data)
 #endif