25-akpm/include/asm-i386/processor.h |    2 ++
 1 files changed, 2 insertions(+)

diff -puN include/asm-i386/processor.h~disable-athlon-prefetch include/asm-i386/processor.h
--- 25/include/asm-i386/processor.h~disable-athlon-prefetch	Thu Aug 28 11:40:09 2003
+++ 25-akpm/include/asm-i386/processor.h	Thu Aug 28 12:11:56 2003
@@ -578,6 +578,8 @@ static inline void rep_nop(void)
 #define ARCH_HAS_PREFETCH
 extern inline void prefetch(const void *x)
 {
+	if (cpu_data[0].x86_vendor == X86_VENDOR_AMD)
+		return;		/* Some athlons fault if the address is bad */
 	alternative_input(ASM_NOP4,
 			  "prefetchnta (%1)",
 			  X86_FEATURE_XMM,

_