[parisc-linux-cvs] linux-2.6 tausq

[Randolph Chung]

In reference to a message from Randolph Chung, dated Apr 26:
> CVSROOT:	/var/cvs
> Module name:	linux-2.6
> Changes by:	tausq	04/04/26 13:03:05
> 
> Modified files:
> 	.              : Makefile 
> 	include/asm-parisc: processor.h 
> 
> Log message:
> 2.6.6-rc1-pa4
> disable prefetchw for !pa20

only compile-tested...

Index: include/asm-parisc/processor.h
===================================================================
RCS file: /var/cvs/linux-2.6/include/asm-parisc/processor.h,v
retrieving revision 1.6
diff -u -p -r1.6 processor.h
--- a/include/asm-parisc/processor.h	19 Apr 2004 22:32:49 -0000	1.6
+++ b/include/asm-parisc/processor.h	26 Apr 2004 18:59:45 -0000
@@ -325,10 +325,16 @@ extern inline void prefetch(const void *
 }
 
 #define ARCH_HAS_PREFETCHW
+/* PA1.1 doesn't implement prefetch-on-write; so we treat this the same
+   as a prefetch-on-read.  */
+#ifdef CONFIG_PA20
 extern inline void prefetchw(const void *addr)
 {
 	__asm__("ldd 0(%0), %%r0" : : "r" (addr));
 }
+#else
+#define prefetchw(x) prefetch(x)
+#endif
 #endif
 
 #define cpu_relax()	barrier()