---

yaml --- r: 110422 b: refs/heads/master c: 99e1aa1 h: refs/heads/master v: v3
git-mirror · Oct 5, 2008 · 519a40e · 519a40e
1 parent fc4d287
commit 519a40e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 42fde7a05c5d6dc76e518ae12091ea897b1c132b
+refs/heads/master: 99e1aa17ce434010dd820b583628370cc15f10f3
diff --git a/trunk/arch/x86/kernel/cpu/mtrr/main.c b/trunk/arch/x86/kernel/cpu/mtrr/main.c
@@ -1293,6 +1293,15 @@ static int __init mtrr_cleanup(unsigned address_bits)
 	}
 	nr_range = x86_get_mtrr_mem_range(range, 0, extra_remove_base,
 					  extra_remove_size);
+	/*
+	 * [0, 1M) should always be coverred by var mtrr with WB
+	 * and fixed mtrrs should take effective before var mtrr for it
+	 */
+	nr_range = add_range_with_merge(range, nr_range, 0,
+					(1ULL<<(20 - PAGE_SHIFT)) - 1);
+	/* sort the ranges */
+	sort(range, nr_range, sizeof(struct res_range), cmp_range, NULL);
+
 	range_sums = sum_ranges(range, nr_range);
 	printk(KERN_INFO "total RAM coverred: %ldM\n",
 	       range_sums >> (20 - PAGE_SHIFT));