From: Ingo Molnar Date: Wed, 30 Jan 2008 12:33:49 +0000 (+0100) Subject: x86: early_ioremap_init(), enhance warnings X-Git-Tag: v3.12-rc1~24034^2~120 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0e3a95492989e452a33e5df9b51365da574b854d;p=kernel%2Fkernel-generic.git x86: early_ioremap_init(), enhance warnings enhance the debug warning in early_ioremap_init(). Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner --- diff --git a/arch/x86/mm/ioremap_32.c b/arch/x86/mm/ioremap_32.c index b743de8..f8e6c47 100644 --- a/arch/x86/mm/ioremap_32.c +++ b/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)