From a5a6e4cff9dab3223865d1d18bf19212edcf99e5 Mon Sep 17 00:00:00 2001
From: Andreas Herrmann <andreas.herrmann3@amd.com>
Date: Tue, 10 Jun 2008 16:04:30 +0200
Subject: [PATCH] --- yaml --- r: 99491 b: refs/heads/master c:
 ee863ba7ab3d3ed8a9585d378aae69d1e3e9f1b4 h: refs/heads/master i:   99489:
 8b8899860cb31ad5141388a01cfaa618ebc2bc79   99487:
 4d37fdc72f44e35764270a77827c899a28da09c4 v: v3

---
 [refs]                                           | 2 +-
 trunk/arch/x86/kernel/cpu/addon_cpuid_features.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index b5989bf937a2..b7ebaea8ed09 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c26421d01986e1521043c8feb47256833df3bf31
+refs/heads/master: ee863ba7ab3d3ed8a9585d378aae69d1e3e9f1b4
diff --git a/trunk/arch/x86/kernel/cpu/addon_cpuid_features.c b/trunk/arch/x86/kernel/cpu/addon_cpuid_features.c
index d8b3e4a9d663..0fbd06241e07 100644
--- a/trunk/arch/x86/kernel/cpu/addon_cpuid_features.c
+++ b/trunk/arch/x86/kernel/cpu/addon_cpuid_features.c
@@ -54,14 +54,11 @@ void __cpuinit init_scattered_cpuid_features(struct cpuinfo_x86 *c)
 void __cpuinit validate_pat_support(struct cpuinfo_x86 *c)
 {
 	switch (c->x86_vendor) {
-	case X86_VENDOR_AMD:
-		if (c->x86 >= 0xf && c->x86 <= 0x11)
-			return;
-		break;
 	case X86_VENDOR_INTEL:
 		if (c->x86 == 0xF || (c->x86 == 6 && c->x86_model >= 15))
 			return;
 		break;
+	case X86_VENDOR_AMD:
 	case X86_VENDOR_CENTAUR:
 	case X86_VENDOR_TRANSMETA:
 		return;