X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fasm-sparc64%2Fide.h;h=4c1098474c73fd382341b0811e979b11d8fb3d0b;hb=f7f1b0f1e2fbadeab12d24236000e778aa9b1ead;hp=6b327402277fde638548f752c51fec9b0762ce1c;hpb=c7b5ebbddf7bcd3651947760f423e3783bbe6573;p=linux-2.6.git

diff --git a/include/asm-sparc64/ide.h b/include/asm-sparc64/ide.h
index 6b3274022..4c1098474 100644
--- a/include/asm-sparc64/ide.h
+++ b/include/asm-sparc64/ide.h
@@ -13,8 +13,8 @@
 #include <linux/config.h>
 #include <asm/pgalloc.h>
 #include <asm/io.h>
-#include <asm/page.h>
 #include <asm/spitfire.h>
+#include <asm/cacheflush.h>
 
 #ifndef MAX_HWIFS
 # ifdef CONFIG_BLK_DEV_IDEPCI
@@ -51,7 +51,7 @@ static inline unsigned int inw_be(void __iomem *addr)
 
 static inline void __ide_insw(void __iomem *port, void *dst, u32 count)
 {
-#if (L1DCACHE_SIZE > PAGE_SIZE)		/* is there D$ aliasing problem */
+#ifdef DCACHE_ALIASING_POSSIBLE
 	unsigned long end = (unsigned long)dst + (count << 1);
 #endif
 	u16 *ps = dst;
@@ -74,7 +74,7 @@ static inline void __ide_insw(void __iomem *port, void *dst, u32 count)
 	if(count)
 		*ps++ = inw_be(port);
 
-#if (L1DCACHE_SIZE > PAGE_SIZE)		/* is there D$ aliasing problem */
+#ifdef DCACHE_ALIASING_POSSIBLE
 	__flush_dcache_range((unsigned long)dst, end);
 #endif
 }
@@ -88,7 +88,7 @@ static inline void outw_be(unsigned short w, void __iomem *addr)
 
 static inline void __ide_outsw(void __iomem *port, void *src, u32 count)
 {
-#if (L1DCACHE_SIZE > PAGE_SIZE)		/* is there D$ aliasing problem */
+#ifdef DCACHE_ALIASING_POSSIBLE
 	unsigned long end = (unsigned long)src + (count << 1);
 #endif
 	const u16 *ps = src;
@@ -111,7 +111,7 @@ static inline void __ide_outsw(void __iomem *port, void *src, u32 count)
 	if(count)
 		outw_be(*ps, port);
 
-#if (L1DCACHE_SIZE > PAGE_SIZE)		/* is there D$ aliasing problem */
+#ifdef DCACHE_ALIASING_POSSIBLE
 	__flush_dcache_range((unsigned long)src, end);
 #endif
 }