From cdffef9f0190adbf77b8ca379299a4e7d76ceed9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Axel=20D=C3=B6rfler?= <axeld@pinc-software.de>
Date: Wed, 24 May 2006 09:51:56 +0000
Subject: [PATCH] MTRR is no longer set on anything below AMD K6-2 model 9.
 This should fix bug #624.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17572 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/add-ons/kernel/cpu/x86/amd.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/add-ons/kernel/cpu/x86/amd.cpp b/src/add-ons/kernel/cpu/x86/amd.cpp
index 3481afa306..5a5ec656d9 100644
--- a/src/add-ons/kernel/cpu/x86/amd.cpp
+++ b/src/add-ons/kernel/cpu/x86/amd.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005, Haiku, Inc.
+ * Copyright 2005-2006, Haiku, Inc.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -30,6 +30,11 @@ amd_init(void)
 	if ((info.cpu_type & B_CPU_x86_VENDOR_MASK) != B_CPU_AMD_x86)
 		return B_ERROR;
 
+	// The K6-2 doesn't seem to support write-combining (before model 9),
+	// so we ignore anything before that one.
+	if (info.cpu_type <= B_CPU_AMD_K6_2)
+		return B_ERROR;
+
 	generic_mtrr_compute_physical_mask();
 	generic_dump_mtrrs(generic_count_mtrrs());