From: Stoyan Gaydarov <stoyboyker@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: Stoyan Gaydarov <stoyboyker@gmail.com>,
ralf@linux-mips.org, linux-mips@linux-mips.org
Subject: [PATCH 06/25] [mips] BUG to BUG_ON changes
Date: Tue, 10 Mar 2009 00:10:31 -0500 [thread overview]
Message-ID: <1236661850-8237-7-git-send-email-stoyboyker@gmail.com> (raw)
In-Reply-To: <1236661850-8237-6-git-send-email-stoyboyker@gmail.com>
Signed-off-by: Stoyan Gaydarov <stoyboyker@gmail.com>
---
arch/mips/jazz/jazzdma.c | 3 +--
arch/mips/kernel/traps.c | 3 +--
arch/mips/mm/ioremap.c | 9 +++------
3 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/arch/mips/jazz/jazzdma.c b/arch/mips/jazz/jazzdma.c
index c672c08..f0fd636 100644
--- a/arch/mips/jazz/jazzdma.c
+++ b/arch/mips/jazz/jazzdma.c
@@ -68,8 +68,7 @@ static int __init vdma_init(void)
*/
pgtbl = (VDMA_PGTBL_ENTRY *)__get_free_pages(GFP_KERNEL | GFP_DMA,
get_order(VDMA_PGTBL_SIZE));
- if (!pgtbl)
- BUG();
+ BUG_ON(!pgtbl);
dma_cache_wback_inv((unsigned long)pgtbl, VDMA_PGTBL_SIZE);
pgtbl = (VDMA_PGTBL_ENTRY *)KSEG1ADDR(pgtbl);
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index b2d7041..89956d5 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -1277,8 +1277,7 @@ static void *set_vi_srs_handler(int n, vi_handler_t addr, int srs)
u32 *w;
unsigned char *b;
- if (!cpu_has_veic && !cpu_has_vint)
- BUG();
+ BUG_ON(!cpu_has_veic && !cpu_has_vint);
if (addr == NULL) {
handler = (unsigned long) do_default_vi;
diff --git a/arch/mips/mm/ioremap.c b/arch/mips/mm/ioremap.c
index 59945b9..0c43248 100644
--- a/arch/mips/mm/ioremap.c
+++ b/arch/mips/mm/ioremap.c
@@ -27,8 +27,7 @@ static inline void remap_area_pte(pte_t * pte, unsigned long address,
end = address + size;
if (end > PMD_SIZE)
end = PMD_SIZE;
- if (address >= end)
- BUG();
+ BUG_ON(address >= end);
pfn = phys_addr >> PAGE_SHIFT;
do {
if (!pte_none(*pte)) {
@@ -52,8 +51,7 @@ static inline int remap_area_pmd(pmd_t * pmd, unsigned long address,
if (end > PGDIR_SIZE)
end = PGDIR_SIZE;
phys_addr -= address;
- if (address >= end)
- BUG();
+ BUG_ON(address >= end);
do {
pte_t * pte = pte_alloc_kernel(pmd, address);
if (!pte)
@@ -75,8 +73,7 @@ static int remap_area_pages(unsigned long address, phys_t phys_addr,
phys_addr -= address;
dir = pgd_offset(&init_mm, address);
flush_cache_all();
- if (address >= end)
- BUG();
+ BUG_ON(address >= end);
do {
pud_t *pud;
pmd_t *pmd;
--
1.6.1.3
next prev parent reply other threads:[~2009-03-10 5:13 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-10 5:10 [PATCH 00/25] BUG to BUG_ON changes Stoyan Gaydarov
2009-03-10 5:10 ` [PATCH 01/25] [btrfs] " Stoyan Gaydarov
2009-03-10 5:10 ` [PATCH 02/25] [staging] " Stoyan Gaydarov
2009-03-10 5:10 ` [PATCH 03/25] [net] " Stoyan Gaydarov
2009-03-10 5:10 ` [PATCH 04/25] [arm] " Stoyan Gaydarov
2009-03-10 5:10 ` [PATCH 05/25] [ia64] " Stoyan Gaydarov
2009-03-10 5:10 ` Stoyan Gaydarov [this message]
2009-03-10 5:10 ` [PATCH 07/25] [x86] " Stoyan Gaydarov
2009-03-10 5:10 ` [PATCH 08/25] [sparc] " Stoyan Gaydarov
2009-03-10 5:10 ` [PATCH 09/25] [s390] " Stoyan Gaydarov
2009-03-10 5:10 ` [PATCH 10/25] [mn10300] " Stoyan Gaydarov
2009-03-10 5:10 ` [PATCH 11/25] [alpha] " Stoyan Gaydarov
2009-03-10 5:10 ` [PATCH 12/25] [frv] " Stoyan Gaydarov
2009-03-10 5:10 ` [PATCH 13/25] [blackfin] " Stoyan Gaydarov
2009-03-10 5:10 ` [PATCH 14/25] [mm] " Stoyan Gaydarov
2009-03-10 5:10 ` [PATCH 15/25] [cris] " Stoyan Gaydarov
2009-03-10 5:10 ` [PATCH 16/25] [m32r] " Stoyan Gaydarov
2009-03-10 5:10 ` [PATCH 17/25] [parisc] " Stoyan Gaydarov
2009-03-10 5:10 ` [PATCH 18/25] [xtensa] " Stoyan Gaydarov
2009-03-10 5:10 ` [PATCH 19/25] [sysctl.c] " Stoyan Gaydarov
2009-03-10 5:10 ` [PATCH 20/25] [scsi] " Stoyan Gaydarov
2009-03-10 5:10 ` [PATCH 21/25] [afs] " Stoyan Gaydarov
2009-03-10 5:10 ` [PATCH 22/25] [reiserfs] " Stoyan Gaydarov
2009-03-10 5:10 ` [PATCH 23/25] [drivers/misc] " Stoyan Gaydarov
2009-03-10 5:10 ` [PATCH 24/25] [crypto] " Stoyan Gaydarov
2009-03-10 5:10 ` [PATCH 25/25] [drivers] " Stoyan Gaydarov
2009-03-11 11:54 ` [PATCH 21/25] [afs] " David Howells
2009-03-13 4:51 ` [PATCH 17/25] [parisc] " Kyle McMartin
2009-03-10 7:49 ` [PATCH 16/25] [m32r] " Hirokazu Takata
2009-04-02 11:57 ` [PATCH 15/25] [cris] " Jesper Nilsson
2009-03-11 11:48 ` [PATCH 12/25] [frv] " David Howells
2009-03-11 11:36 ` [PATCH 10/25] [mn10300] " David Howells
2009-03-10 11:17 ` [PATCH 09/25] [s390] " Christian Borntraeger
2009-03-10 5:16 ` [PATCH 08/25] [sparc] " David Miller
2009-03-10 8:37 ` [PATCH 07/25] [x86] " Ingo Molnar
2009-03-10 8:57 ` [tip:x86/debug] x86: " Stoyan Gaydarov
2009-03-11 19:18 ` [PATCH 06/25] [mips] " Ralf Baechle
2009-03-10 5:16 ` [PATCH 03/25] [net] " David Miller
2009-03-10 10:23 ` Alexey Dobriyan
2009-03-10 11:24 ` David Miller
2009-03-10 19:54 ` Brandeburg, Jesse
2009-03-10 10:22 ` [PATCH 02/25] [staging] " Alexey Dobriyan
2009-03-10 9:16 ` [PATCH 01/25] [btrfs] " David John
2009-03-10 18:16 ` Stoyan Gaydarov
2009-03-10 18:20 ` Oliver Mattos
2009-03-10 13:24 ` Chris Mason
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1236661850-8237-7-git-send-email-stoyboyker@gmail.com \
--to=stoyboyker@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=ralf@linux-mips.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox