Commit 6aa0d3a9 authored by Stoyan Gaydarov's avatar Stoyan Gaydarov Committed by Martin Schwidefsky
Browse files

[S390] BUG to BUG_ON changes 



Signed-off-by: default avatarStoyan Gaydarov <stoyboyker@gmail.com>
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 59f2e69d

arch/s390/kernel/debug.c

+1 −2
Original line number Diff line number Diff line
@@ -698,8 +698,7 @@ debug_info_t *debug_register_mode(const char *name, int pages_per_area, 
	if ((uid != 0) || (gid != 0))

		pr_warning("Root becomes the owner of all s390dbf files "

			   "in sysfs\n");

	if (!initialized)

		BUG();

	BUG_ON(!initialized);

	mutex_lock(&debug_mutex);



        /* create new debug_info */

arch/s390/kernel/setup.c

+1 −2
Original line number Diff line number Diff line
@@ -134,8 +134,7 @@ void __cpuinit cpu_init(void) 


	atomic_inc(&init_mm.mm_count);

	current->active_mm = &init_mm;

        if (current->mm)

                BUG();

	BUG_ON(current->mm);

        enter_lazy_tlb(&init_mm, current);

}

drivers/s390/char/tape_3590.c

+1 −2
Original line number Diff line number Diff line
@@ -664,8 +664,7 @@ tape_3590_bread(struct tape_device *device, struct request *req) 
			ccw++;

			dst += TAPEBLOCK_HSEC_SIZE;

		}

		if (off > bv->bv_len)

			BUG();

		BUG_ON(off > bv->bv_len);

	}

	ccw = tape_ccw_end(ccw, NOP, 0, NULL);

	DBF_EVENT(6, "xBREDccwg\n");

drivers/s390/char/tape_core.c

+2 −4
Original line number Diff line number Diff line
@@ -624,8 +624,7 @@ tape_alloc_request(int cplength, int datasize) 
{

	struct tape_request *request;



	if (datasize > PAGE_SIZE || (cplength*sizeof(struct ccw1)) > PAGE_SIZE)

		BUG();

	BUG_ON(datasize > PAGE_SIZE || (cplength*sizeof(struct ccw1)) > PAGE_SIZE);



	DBF_LH(6, "tape_alloc_request(%d, %d)\n", cplength, datasize);
@@ -782,8 +781,7 @@ static void tape_long_busy_timeout(unsigned long data) 
	device = (struct tape_device *) data;

	spin_lock_irq(get_ccwdev_lock(device->cdev));

	request = list_entry(device->req_queue.next, struct tape_request, list);

	if (request->status != TAPE_REQUEST_LONG_BUSY)

		BUG();

	BUG_ON(request->status != TAPE_REQUEST_LONG_BUSY);

	DBF_LH(6, "%08x: Long busy timeout.\n", device->cdev_id);

	__tape_start_next_request(device);

	device->lb_timeout.data = (unsigned long) tape_put_device(device);

drivers/s390/char/tape_std.c

+2 −2
Original line number Diff line number Diff line
@@ -37,8 +37,8 @@ tape_std_assign_timeout(unsigned long data) 
	int rc;



	request = (struct tape_request *) data;

	if ((device = request->device) == NULL)

		BUG();

	device = request->device;

	BUG_ON(!device);



	DBF_EVENT(3, "%08x: Assignment timeout. Device busy.\n",

			device->cdev_id);