summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2009-11-16 23:04:56 -0800
committerH. Peter Anvin <hpa@zytor.com>2009-11-17 10:26:53 -0800
commit508d85c2c6bc8cba53d2a54d9a306ad64a0a80bf (patch)
treec16016bae57e594ee8dbbc48f46a9eaf599d9a56
parent5bd085b5fbd8b0b8685a2173cb9263798fc2a44e (diff)
x86: When cleaning MTRRs, do not fold WP into UC
The current MTRR code treats WP as a form of UC. This really isn't desirable behaviour, except possibly in the case of severe MTRR shortage. Disable this, to allow legitimate uses of WP to remain unmolested. Signed-off-by: Yinghai Lu <yinghai@kernel.org> Signed-off-by: H. Peter Anvin <hpa@zytor.com> Cc: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/x86/kernel/cpu/mtrr/cleanup.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/mtrr/cleanup.c b/arch/x86/kernel/cpu/mtrr/cleanup.c
index 315738c74aa..6e49f6f91f3 100644
--- a/arch/x86/kernel/cpu/mtrr/cleanup.c
+++ b/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]++;
}