* [Patch] change if() BUG(); to BUG_ON in iommu.c
@ 2006-01-16 21:07 Eric Sesterhenn / snakebyte
2006-01-17 23:36 ` David S. Miller
0 siblings, 1 reply; 2+ messages in thread
From: Eric Sesterhenn / snakebyte @ 2006-01-16 21:07 UTC (permalink / raw)
To: sparclinux
hi,
this patch changes if() BUG(); constructs
in iommu.c to BUG_ON(); so it gets save
to define BUG() and BUG_ON() to nullstatements.
Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
--- linux-2.6.15-git11/arch/sparc/mm/iommu.c.orig 2006-01-16 22:02:41.000000000 +0100
+++ linux-2.6.15-git11/arch/sparc/mm/iommu.c 2006-01-16 22:03:39.000000000 +0100
@@ -295,8 +295,7 @@ static void iommu_release_one(u32 busa,
int ioptex;
int i;
- if (busa < iommu->start)
- BUG();
+ BUG_ON(busa < iommu->start);
ioptex = (busa - iommu->start) >> PAGE_SHIFT;
for (i = 0; i < npages; i++) {
iopte_val(iommu->page_table[ioptex + i]) = 0;
@@ -340,9 +339,9 @@ static int iommu_map_dma_area(dma_addr_t
iopte_t *first;
int ioptex;
- if ((va & ~PAGE_MASK) != 0) BUG();
- if ((addr & ~PAGE_MASK) != 0) BUG();
- if ((len & ~PAGE_MASK) != 0) BUG();
+ BUG_ON((va & ~PAGE_MASK) != 0);
+ BUG_ON((addr & ~PAGE_MASK) != 0);
+ BUG_ON((len & ~PAGE_MASK) != 0);
/* page color = physical address */
ioptex = bit_map_string_get(&iommu->usemap, len >> PAGE_SHIFT,
@@ -405,8 +404,8 @@ static void iommu_unmap_dma_area(unsigne
unsigned long end;
int ioptex = (busa - iommu->start) >> PAGE_SHIFT;
- if ((busa & ~PAGE_MASK) != 0) BUG();
- if ((len & ~PAGE_MASK) != 0) BUG();
+ BUG_ON((busa & ~PAGE_MASK) != 0);
+ BUG_ON((len & ~PAGE_MASK) != 0);
iopte += ioptex;
end = busa + len;
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [Patch] change if() BUG(); to BUG_ON in iommu.c
2006-01-16 21:07 [Patch] change if() BUG(); to BUG_ON in iommu.c Eric Sesterhenn / snakebyte
@ 2006-01-17 23:36 ` David S. Miller
0 siblings, 0 replies; 2+ messages in thread
From: David S. Miller @ 2006-01-17 23:36 UTC (permalink / raw)
To: sparclinux
From: Eric Sesterhenn / snakebyte <snakebyte@gmx.de>
Date: Mon, 16 Jan 2006 22:07:06 +0100
> this patch changes if() BUG(); constructs
> in iommu.c to BUG_ON(); so it gets save
> to define BUG() and BUG_ON() to nullstatements.
>
> Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
Applied, thanks Eric.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2006-01-17 23:36 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-01-16 21:07 [Patch] change if() BUG(); to BUG_ON in iommu.c Eric Sesterhenn / snakebyte
2006-01-17 23:36 ` David S. Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.