summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYinghai Lu <yhlu.kernel@gmail.com>2008-10-04 19:34:18 -0700
committerH. Peter Anvin <hpa@zytor.com>2008-10-04 20:07:14 -0700
commit42fde7a05c5d6dc76e518ae12091ea897b1c132b (patch)
tree1b91305a481f706a4a90c2e32d9a1352ee5b85ef
parent8bb39311bf461243f6cade3644764d848516dd23 (diff)
downloadkernel-crypto-42fde7a05c5d6dc76e518ae12091ea897b1c132b.tar.gz
kernel-crypto-42fde7a05c5d6dc76e518ae12091ea897b1c132b.tar.xz
kernel-crypto-42fde7a05c5d6dc76e518ae12091ea897b1c132b.zip
x86: mtrr_cleanup: print out correct type v2
Print out the correct type when the Write Protected (WP) type is seen. Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
-rw-r--r--arch/x86/kernel/cpu/mtrr/main.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
index 406074c46f1..9086b38fbab 100644
--- a/arch/x86/kernel/cpu/mtrr/main.c
+++ b/arch/x86/kernel/cpu/mtrr/main.c
@@ -1273,12 +1273,14 @@ static int __init mtrr_cleanup(unsigned address_bits)
size_base = to_size_factor(size_base, &size_factor),
start_base = range_state[i].base_pfn << (PAGE_SHIFT - 10);
start_base = to_size_factor(start_base, &start_factor),
+ type = range_state[i].type;
printk(KERN_DEBUG "reg %d, base: %ld%cB, range: %ld%cB, type %s\n",
i, start_base, start_factor,
size_base, size_factor,
(type == MTRR_TYPE_UNCACHABLE) ? "UC" :
- ((type == MTRR_TYPE_WRBACK) ? "WB" : "Other")
+ ((type == MTRR_TYPE_WRPROT) ? "WP" :
+ ((type == MTRR_TYPE_WRBACK) ? "WB" : "Other"))
);
}