Merge tag 'parisc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6

[mv-sheeva.git] / arch / parisc / include / asm / prefetch.h

diff --git a/arch/parisc/include/asm/prefetch.h b/arch/parisc/include/asm/prefetch.h
index c5edc60c059f08d0d7b610bdf9793a56db7af0f8..1ee7c82672c1c8791f995e5a61c6f0f30bbcf4c7 100644 (file)
--- a/arch/parisc/include/asm/prefetch.h
+++ b/arch/parisc/include/asm/prefetch.h
@@ -21,7 +21,12 @@
 #define ARCH_HAS_PREFETCH
 static inline void prefetch(const void *addr)
 {
-       __asm__("ldw 0(%0), %%r0" : : "r" (addr));
+       __asm__(
+#ifndef CONFIG_PA20
+               /* Need to avoid prefetch of NULL on PA7300LC */
+               "       extrw,u,= %0,31,32,%%r0\n"
+#endif
+               "       ldw 0(%0), %%r0" : : "r" (addr));
 }
 
 /* LDD is a PA2.0 addition. */