---

yaml
---
r: 110423
b: refs/heads/master
c: dd55235
h: refs/heads/master
i:
  110421: fc4d287
  110419: 6f71608
  110415: 891a29c
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 99e1aa17ce434010dd820b583628370cc15f10f3
+refs/heads/master: dd5523552c2897e3fde16fc2fc8f6332addf66ab

trunk/arch/x86/kernel/cpu/mtrr/main.c

@@ -759,7 +759,8 @@ x86_get_mtrr_mem_range(struct res_range *range, int nr_range,
 	/* take out UC ranges */
 	for (i = 0; i < num_var_ranges; i++) {
 		type = range_state[i].type;
-		if (type != MTRR_TYPE_UNCACHABLE)
+		if (type != MTRR_TYPE_UNCACHABLE &&
+		    type != MTRR_TYPE_WRPROT)
 			continue;
 		size = range_state[i].size_pfn;
 		if (!size)
@@ -1248,6 +1249,8 @@ static int __init mtrr_cleanup(unsigned address_bits)
 			continue;
 		if (!size)
 			type = MTRR_NUM_TYPES;
+		if (type == MTRR_TYPE_WRPROT)
+			type = MTRR_TYPE_UNCACHABLE;
 		num[type]++;
 	}