diff options
| author | Stoyan Gaydarov <stoyboyker@gmail.com> | 2010-10-27 18:28:33 +0200 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2010-10-27 18:28:33 +0200 |
| commit | 292aa141277b142148d15bf28104f8890616e291 (patch) | |
| tree | 5a6c3c34c1b86494c73ab34a90ed9d47b17295e1 /arch/mn10300/mm | |
| parent | Partially revert patch that encloses asm-offset.h numbers in brackets (diff) | |
| download | linux-292aa141277b142148d15bf28104f8890616e291.tar.xz linux-292aa141277b142148d15bf28104f8890616e291.zip | |
MN10300: BUG to BUG_ON changes
Signed-off-by: Stoyan Gaydarov <stoyboyker@gmail.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'arch/mn10300/mm')
| -rw-r--r-- | arch/mn10300/mm/init.c | 3 | ||||
| -rw-r--r-- | arch/mn10300/mm/misalignment.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/arch/mn10300/mm/init.c b/arch/mn10300/mm/init.c index 6e6bc0e51521..f86c28315a8e 100644 --- a/arch/mn10300/mm/init.c +++ b/arch/mn10300/mm/init.c @@ -84,8 +84,7 @@ void __init mem_init(void) int codesize, reservedpages, datasize, initsize; int tmp; - if (!mem_map) - BUG(); + BUG_ON(!mem_map); #define START_PFN (contig_page_data.bdata->node_min_pfn) #define MAX_LOW_PFN (contig_page_data.bdata->node_low_pfn) diff --git a/arch/mn10300/mm/misalignment.c b/arch/mn10300/mm/misalignment.c index 6dffbf97ac26..eef989c1d0c1 100644 --- a/arch/mn10300/mm/misalignment.c +++ b/arch/mn10300/mm/misalignment.c @@ -449,8 +449,7 @@ found_opcode: regs->pc, opcode, pop->opcode, pop->params[0], pop->params[1]); tmp = format_tbl[pop->format].opsz; - if (tmp > noc) - BUG(); /* match was less complete than it ought to have been */ + BUG_ON(tmp > noc); /* match was less complete than it ought to have been */ if (tmp < noc) { tmp = noc - tmp; |