git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 2.0 rc7
[linux-2.6.git]
/
include
/
asm-sparc64
/
ide.h
diff --git
a/include/asm-sparc64/ide.h
b/include/asm-sparc64/ide.h
index
6b32740
..
4c10984
100644
(file)
--- 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 <linux/config.h>
#include <asm/pgalloc.h>
#include <asm/io.h>
-#include <asm/page.h>
#include <asm/spitfire.h>
#include <asm/spitfire.h>
+#include <asm/cacheflush.h>
#ifndef MAX_HWIFS
# ifdef CONFIG_BLK_DEV_IDEPCI
#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)
{
static inline void __ide_insw(void __iomem *port, void *dst, u32 count)
{
-#if
(L1DCACHE_SIZE > PAGE_SIZE) /* is there D$ aliasing problem */
+#if
def DCACHE_ALIASING_POSSIBLE
unsigned long end = (unsigned long)dst + (count << 1);
#endif
u16 *ps = dst;
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(count)
*ps++ = inw_be(port);
-#if
(L1DCACHE_SIZE > PAGE_SIZE) /* is there D$ aliasing problem */
+#if
def DCACHE_ALIASING_POSSIBLE
__flush_dcache_range((unsigned long)dst, end);
#endif
}
__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)
{
static inline void __ide_outsw(void __iomem *port, void *src, u32 count)
{
-#if
(L1DCACHE_SIZE > PAGE_SIZE) /* is there D$ aliasing problem */
+#if
def DCACHE_ALIASING_POSSIBLE
unsigned long end = (unsigned long)src + (count << 1);
#endif
const u16 *ps = src;
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(count)
outw_be(*ps, port);
-#if
(L1DCACHE_SIZE > PAGE_SIZE) /* is there D$ aliasing problem */
+#if
def DCACHE_ALIASING_POSSIBLE
__flush_dcache_range((unsigned long)src, end);
#endif
}
__flush_dcache_range((unsigned long)src, end);
#endif
}