>From 08d2e6f14230bf2252c54f5421d92def5e70f6dc Mon Sep 17 00:00:00 2001 From: Claudio Scordino Date: Mon, 8 Sep 2008 16:03:38 +0200 Subject: [PATCH 1/1] Fix compilation warning in remap_area_pte Signed-off-by: Claudio Scordino --- arch/arm/mm/ioremap.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c index b81dbf9..bc6eca0 100644 --- a/arch/arm/mm/ioremap.c +++ b/arch/arm/mm/ioremap.c @@ -52,18 +52,15 @@ static int remap_area_pte(pmd_t *pmd, unsigned long addr, unsigned long end, return -ENOMEM; do { - if (!pte_none(*pte)) - goto bad; - + if (unlikely(!pte_none(*pte))){ + printk(KERN_CRIT "%s: page already exists\n", __FUNCTION__); + BUG(); + } set_pte_ext(pte, pfn_pte(phys_addr >> PAGE_SHIFT, prot), type->prot_pte_ext); phys_addr += PAGE_SIZE; } while (pte++, addr += PAGE_SIZE, addr != end); return 0; - - bad: - printk(KERN_CRIT "remap_area_pte: page already exists\n"); - BUG(); } static inline int remap_area_pmd(pgd_t *pgd, unsigned long addr, -- 1.5.4.3