---

yaml --- r: 80455 b: refs/heads/master c: 0e3a954 h: refs/heads/master i: 80453: e9c7dfd 80451: b20de35 80447: ab401c1 v: v3
git-mirror · Jan 30, 2008 · c23b133 · c23b133
1 parent 435d942
commit c23b133
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 927222b102186a6cc3e43e25062fcd18c800435e
+refs/heads/master: 0e3a95492989e452a33e5df9b51365da574b854d
diff --git a/trunk/arch/x86/mm/ioremap_32.c b/trunk/arch/x86/mm/ioremap_32.c
@@ -243,7 +243,22 @@ void __init early_ioremap_init(void)
 	pgd = early_ioremap_pgd(fix_to_virt(FIX_BTMAP_BEGIN));
 	*pgd = __pa(bm_pte) | _PAGE_TABLE;
 	memset(bm_pte, 0, sizeof(bm_pte));
-	BUG_ON(pgd != early_ioremap_pgd(fix_to_virt(FIX_BTMAP_END)));
+	/*
+	 * The boot-ioremap range spans multiple pgds, for which
+	 * we are not prepared:
+	 */
+	if (pgd != early_ioremap_pgd(fix_to_virt(FIX_BTMAP_END))) {
+		WARN_ON(1);
+		printk("pgd %p != %p\n",
+			pgd, early_ioremap_pgd(fix_to_virt(FIX_BTMAP_END)));
+		printk("fix_to_virt(FIX_BTMAP_BEGIN): %08lx\n",
+			fix_to_virt(FIX_BTMAP_BEGIN));
+		printk("fix_to_virt(FIX_BTMAP_END):   %08lx\n",
+			fix_to_virt(FIX_BTMAP_END));
+
+		printk("FIX_BTMAP_END:       %d\n", FIX_BTMAP_END);
+		printk("FIX_BTMAP_BEGIN:     %d\n", FIX_BTMAP_BEGIN);
+	}
 }
 
 void __init early_ioremap_clear(void)