---

yaml --- r: 360940 b: refs/heads/master c: 60f583d h: refs/heads/master v: v3
git-mirror · Mar 7, 2013 · 613e956 · 613e956
1 parent e839a57
commit 613e956
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c4aff6b9a183b4f24eb7b8dd6c8a92cdba3bc75
+refs/heads/master: 60f583d56aa515b896a9d94f860f52640c1e8a75
diff --git a/trunk/arch/x86/mm/pat.c b/trunk/arch/x86/mm/pat.c
@@ -563,6 +563,13 @@ int kernel_map_sync_memtype(u64 base, unsigned long size, unsigned long flags)
 	if (base > __pa(high_memory-1))
 		return 0;
 
+	/*
+	 * some areas in the middle of the kernel identity range
+	 * are not mapped, like the PCI space.
+	 */
+	if (!page_is_ram(base >> PAGE_SHIFT))
+		return 0;
+
 	id_sz = (__pa(high_memory-1) <= base + size) ?
 				__pa(high_memory) - base :
 				size;