From b9fc8f8126807468bbc81fe3a6951a368421dfc8 Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yinghai@kernel.org>
Date: Mon, 16 Nov 2009 23:04:56 -0800
Subject: [PATCH] --- yaml --- r: 173052 b: refs/heads/master c:
 508d85c2c6bc8cba53d2a54d9a306ad64a0a80bf h: refs/heads/master v: v3

---
 [refs]                                   | 2 +-
 trunk/arch/x86/kernel/cpu/mtrr/cleanup.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d1659d552929..2ba09dc23ba1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5bd085b5fbd8b0b8685a2173cb9263798fc2a44e
+refs/heads/master: 508d85c2c6bc8cba53d2a54d9a306ad64a0a80bf
diff --git a/trunk/arch/x86/kernel/cpu/mtrr/cleanup.c b/trunk/arch/x86/kernel/cpu/mtrr/cleanup.c
index 315738c74aad..6e49f6f91f31 100644
--- a/trunk/arch/x86/kernel/cpu/mtrr/cleanup.c
+++ b/trunk/arch/x86/kernel/cpu/mtrr/cleanup.c
@@ -689,8 +689,6 @@ static int __init mtrr_need_cleanup(void)
 			continue;
 		if (!size)
 			type = MTRR_NUM_TYPES;
-		if (type == MTRR_TYPE_WRPROT)
-			type = MTRR_TYPE_UNCACHABLE;
 		num[type]++;
 	}