Commit b72b7092 authored by Ralf Baechle's avatar Ralf Baechle
Browse files

MIPS: Use BUG_ON() where possible. 



Based on original patch by Stoyan Gaydarov <stoyboyker@gmail.com> which
missed a few places.

Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent ae035505

arch/mips/jazz/jazzdma.c

+1 −2
Original line number Diff line number Diff line
@@ -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);

arch/mips/kernel/traps.c

+1 −2
Original line number Diff line number Diff line
@@ -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;

arch/mips/mm/highmem.c

+3 −6
Original line number Diff line number Diff line
@@ -17,8 +17,7 @@ void *__kmap(struct page *page) 


void __kunmap(struct page *page)

{

	if (in_interrupt())

		BUG();

	BUG_ON(in_interrupt());

	if (!PageHighMem(page))

		return;

	kunmap_high(page);
@@ -46,8 +45,7 @@ void *__kmap_atomic(struct page *page, enum km_type type) 
	idx = type + KM_TYPE_NR*smp_processor_id();

	vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);

#ifdef CONFIG_DEBUG_HIGHMEM

	if (!pte_none(*(kmap_pte-idx)))

		BUG();

	BUG_ON(!pte_none(*(kmap_pte - idx)));

#endif

	set_pte(kmap_pte-idx, mk_pte(page, kmap_prot));

	local_flush_tlb_one((unsigned long)vaddr);
@@ -66,8 +64,7 @@ void __kunmap_atomic(void *kvaddr, enum km_type type) 
		return;

	}



	if (vaddr != __fix_to_virt(FIX_KMAP_BEGIN+idx))

		BUG();

	BUG_ON(vaddr != __fix_to_virt(FIX_KMAP_BEGIN + idx));



	/*

	 * force other mappings to Oops if they'll try to access

arch/mips/mm/init.c

+1 −2
Original line number Diff line number Diff line
@@ -307,8 +307,7 @@ void __init fixrange_init(unsigned long start, unsigned long end, 
				if (pmd_none(*pmd)) {

					pte = (pte_t *) alloc_bootmem_low_pages(PAGE_SIZE);

					set_pmd(pmd, __pmd((unsigned long)pte));

					if (pte != pte_offset_kernel(pmd, 0))

						BUG();

					BUG_ON(pte != pte_offset_kernel(pmd, 0));

				}

				vaddr += PMD_SIZE;

			}

arch/mips/mm/ioremap.c

+3 −6
Original line number Diff line number Diff line
@@ -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;