diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2009-03-30 08:49:44 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2009-03-30 08:49:44 -0400 |
commit | b72b7092f8f5f0729cc9f0868997351f21dbc5cd (patch) | |
tree | e384dbc5a43d4a2288360a8ccf6a48f7ba9dfcb4 /arch/mips/mm/ioremap.c | |
parent | ae03550500654e95c47229775bfec33ed0effe40 (diff) |
MIPS: Use BUG_ON() where possible.
Based on original patch by Stoyan Gaydarov <stoyboyker@gmail.com> which
missed a few places.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/mm/ioremap.c')
-rw-r--r-- | arch/mips/mm/ioremap.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/arch/mips/mm/ioremap.c b/arch/mips/mm/ioremap.c index 59945b9ee23c..0c43248347bd 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, | |||
27 | end = address + size; | 27 | end = address + size; |
28 | if (end > PMD_SIZE) | 28 | if (end > PMD_SIZE) |
29 | end = PMD_SIZE; | 29 | end = PMD_SIZE; |
30 | if (address >= end) | 30 | BUG_ON(address >= end); |
31 | BUG(); | ||
32 | pfn = phys_addr >> PAGE_SHIFT; | 31 | pfn = phys_addr >> PAGE_SHIFT; |
33 | do { | 32 | do { |
34 | if (!pte_none(*pte)) { | 33 | if (!pte_none(*pte)) { |
@@ -52,8 +51,7 @@ static inline int remap_area_pmd(pmd_t * pmd, unsigned long address, | |||
52 | if (end > PGDIR_SIZE) | 51 | if (end > PGDIR_SIZE) |
53 | end = PGDIR_SIZE; | 52 | end = PGDIR_SIZE; |
54 | phys_addr -= address; | 53 | phys_addr -= address; |
55 | if (address >= end) | 54 | BUG_ON(address >= end); |
56 | BUG(); | ||
57 | do { | 55 | do { |
58 | pte_t * pte = pte_alloc_kernel(pmd, address); | 56 | pte_t * pte = pte_alloc_kernel(pmd, address); |
59 | if (!pte) | 57 | if (!pte) |
@@ -75,8 +73,7 @@ static int remap_area_pages(unsigned long address, phys_t phys_addr, | |||
75 | phys_addr -= address; | 73 | phys_addr -= address; |
76 | dir = pgd_offset(&init_mm, address); | 74 | dir = pgd_offset(&init_mm, address); |
77 | flush_cache_all(); | 75 | flush_cache_all(); |
78 | if (address >= end) | 76 | BUG_ON(address >= end); |
79 | BUG(); | ||
80 | do { | 77 | do { |
81 | pud_t *pud; | 78 | pud_t *pud; |
82 | pmd_t *pmd; | 79 | pmd_t *pmd; |