From e13ae852f1a6c712150114d4979eb1d15abb7e76 Mon Sep 17 00:00:00 2001 From: James Bottomley Date: Wed, 16 May 2012 11:10:27 +0100 Subject: [PATCH] --- yaml --- r: 300357 b: refs/heads/master c: b3cb8674811d1851bbf1486a73d62b90c119b994 h: refs/heads/master i: 300355: 7ad5a943b55486e673b4ce75026ce6272ff2a0cb v: v3 --- [refs] | 2 +- trunk/arch/parisc/include/asm/prefetch.h | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b70408f721d4..d36bca13e7e1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 207f583d7179f707f402c36a7bda5ca1fd03ad5b +refs/heads/master: b3cb8674811d1851bbf1486a73d62b90c119b994 diff --git a/trunk/arch/parisc/include/asm/prefetch.h b/trunk/arch/parisc/include/asm/prefetch.h index c5edc60c059f..1ee7c82672c1 100644 --- a/trunk/arch/parisc/include/asm/prefetch.h +++ b/trunk/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. */