linux-mips
[Top] [All Lists]

[patch] 2.4: Revert interface removal

To: Ralf Baechle <ralf@uni-koblenz.de>, linux-mips@oss.sgi.com
Subject: [patch] 2.4: Revert interface removal
From: "Maciej W. Rozycki" <macro@ds2.pg.gda.pl>
Date: Mon, 5 Aug 2002 11:05:40 +0200 (MET DST)
Organization: Technical University of Gdansk
Sender: owner-linux-mips@oss.sgi.com
Hello,

 A recent change to include/asm-mips/scatterlist.h broke
drivers/scsi/dec_esp.c.  Since 2.4.19 is not the proper version to remove
interfaces, I'm going to check in the following patch to the 2.4 branch to
revert the change (with a slightly sanitized type for the dvma_address
member). 

 Any objections?

  Maciej

-- 
+  Maciej W. Rozycki, Technical University of Gdansk, Poland   +
+--------------------------------------------------------------+
+        e-mail: macro@ds2.pg.gda.pl, PGP key available        +

patch-mips-2.4.19-rc1-20020802-sg-2
diff -up --recursive --new-file 
linux-mips-2.4.19-rc1-20020802.macro/include/asm-mips/scatterlist.h 
linux-mips-2.4.19-rc1-20020802/include/asm-mips/scatterlist.h
--- linux-mips-2.4.19-rc1-20020802.macro/include/asm-mips/scatterlist.h 
2002-08-01 15:57:53.000000000 +0000
+++ linux-mips-2.4.19-rc1-20020802/include/asm-mips/scatterlist.h       
2002-08-03 20:43:35.000000000 +0000
@@ -10,6 +10,13 @@ struct scatterlist {
        unsigned int length;
 };
 
+struct mmu_sglist {
+       char *addr;
+       char *__dont_touch;
+       unsigned int len;
+       dma_addr_t dvma_address;
+};
+
 #define ISA_DMA_THRESHOLD (0x00ffffff)
 
 #endif /* __ASM_SCATTERLIST_H */
diff -up --recursive --new-file 
linux-mips-2.4.19-rc1-20020802.macro/include/asm-mips64/scatterlist.h 
linux-mips-2.4.19-rc1-20020802/include/asm-mips64/scatterlist.h
--- linux-mips-2.4.19-rc1-20020802.macro/include/asm-mips64/scatterlist.h       
2002-08-01 15:57:54.000000000 +0000
+++ linux-mips-2.4.19-rc1-20020802/include/asm-mips64/scatterlist.h     
2002-08-03 20:43:44.000000000 +0000
@@ -10,6 +10,13 @@ struct scatterlist {
        unsigned long length;
 };
 
+struct mmu_sglist {
+       char *addr;
+       char *__dont_touch;
+       unsigned long len;
+       dma_addr_t dvma_address;
+};
+
 #define ISA_DMA_THRESHOLD (0x00ffffff)
 
 #endif /* __ASM_SCATTERLIST_H */


<Prev in Thread] Current Thread [Next in Thread>