aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStoyan Gaydarov <stoyboyker@gmail.com>2009-03-26 10:24:47 -0400
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2009-03-26 10:24:28 -0400
commit6aa0d3a922c4f58fc36cc1502c6ac72f999e26bb (patch)
tree36e27fe870cc142115d7aff1a78ad2a927a4a874
parent59f2e69d0f95bc00353628ef33fd534fbb8e3597 (diff)
[S390] BUG to BUG_ON changes
Signed-off-by: Stoyan Gaydarov <stoyboyker@gmail.com> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
-rw-r--r--arch/s390/kernel/debug.c3
-rw-r--r--arch/s390/kernel/setup.c3
-rw-r--r--drivers/s390/char/tape_3590.c3
-rw-r--r--drivers/s390/char/tape_core.c6
-rw-r--r--drivers/s390/char/tape_std.c4
5 files changed, 7 insertions, 12 deletions
diff --git a/arch/s390/kernel/debug.c b/arch/s390/kernel/debug.c
index ba03fc0a3a56..39137b9e1622 100644
--- a/arch/s390/kernel/debug.c
+++ b/arch/s390/kernel/debug.c
@@ -698,8 +698,7 @@ debug_info_t *debug_register_mode(const char *name, int pages_per_area,
698 if ((uid != 0) || (gid != 0)) 698 if ((uid != 0) || (gid != 0))
699 pr_warning("Root becomes the owner of all s390dbf files " 699 pr_warning("Root becomes the owner of all s390dbf files "
700 "in sysfs\n"); 700 "in sysfs\n");
701 if (!initialized) 701 BUG_ON(!initialized);
702 BUG();
703 mutex_lock(&debug_mutex); 702 mutex_lock(&debug_mutex);
704 703
705 /* create new debug_info */ 704 /* create new debug_info */
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index 46fc981e02ba..580abb53ce83 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -134,8 +134,7 @@ void __cpuinit cpu_init(void)
134 134
135 atomic_inc(&init_mm.mm_count); 135 atomic_inc(&init_mm.mm_count);
136 current->active_mm = &init_mm; 136 current->active_mm = &init_mm;
137 if (current->mm) 137 BUG_ON(current->mm);
138 BUG();
139 enter_lazy_tlb(&init_mm, current); 138 enter_lazy_tlb(&init_mm, current);
140} 139}
141 140
diff --git a/drivers/s390/char/tape_3590.c b/drivers/s390/char/tape_3590.c
index 5a5bb97a081a..fc1d91294143 100644
--- a/drivers/s390/char/tape_3590.c
+++ b/drivers/s390/char/tape_3590.c
@@ -664,8 +664,7 @@ tape_3590_bread(struct tape_device *device, struct request *req)
664 ccw++; 664 ccw++;
665 dst += TAPEBLOCK_HSEC_SIZE; 665 dst += TAPEBLOCK_HSEC_SIZE;
666 } 666 }
667 if (off > bv->bv_len) 667 BUG_ON(off > bv->bv_len);
668 BUG();
669 } 668 }
670 ccw = tape_ccw_end(ccw, NOP, 0, NULL); 669 ccw = tape_ccw_end(ccw, NOP, 0, NULL);
671 DBF_EVENT(6, "xBREDccwg\n"); 670 DBF_EVENT(6, "xBREDccwg\n");
diff --git a/drivers/s390/char/tape_core.c b/drivers/s390/char/tape_core.c
index 1b6a24412465..08c09d3503cf 100644
--- a/drivers/s390/char/tape_core.c
+++ b/drivers/s390/char/tape_core.c
@@ -624,8 +624,7 @@ tape_alloc_request(int cplength, int datasize)
624{ 624{
625 struct tape_request *request; 625 struct tape_request *request;
626 626
627 if (datasize > PAGE_SIZE || (cplength*sizeof(struct ccw1)) > PAGE_SIZE) 627 BUG_ON(datasize > PAGE_SIZE || (cplength*sizeof(struct ccw1)) > PAGE_SIZE);
628 BUG();
629 628
630 DBF_LH(6, "tape_alloc_request(%d, %d)\n", cplength, datasize); 629 DBF_LH(6, "tape_alloc_request(%d, %d)\n", cplength, datasize);
631 630
@@ -782,8 +781,7 @@ static void tape_long_busy_timeout(unsigned long data)
782 device = (struct tape_device *) data; 781 device = (struct tape_device *) data;
783 spin_lock_irq(get_ccwdev_lock(device->cdev)); 782 spin_lock_irq(get_ccwdev_lock(device->cdev));
784 request = list_entry(device->req_queue.next, struct tape_request, list); 783 request = list_entry(device->req_queue.next, struct tape_request, list);
785 if (request->status != TAPE_REQUEST_LONG_BUSY) 784 BUG_ON(request->status != TAPE_REQUEST_LONG_BUSY);
786 BUG();
787 DBF_LH(6, "%08x: Long busy timeout.\n", device->cdev_id); 785 DBF_LH(6, "%08x: Long busy timeout.\n", device->cdev_id);
788 __tape_start_next_request(device); 786 __tape_start_next_request(device);
789 device->lb_timeout.data = (unsigned long) tape_put_device(device); 787 device->lb_timeout.data = (unsigned long) tape_put_device(device);
diff --git a/drivers/s390/char/tape_std.c b/drivers/s390/char/tape_std.c
index 44dd0f80c847..1a9420ba518d 100644
--- a/drivers/s390/char/tape_std.c
+++ b/drivers/s390/char/tape_std.c
@@ -37,8 +37,8 @@ tape_std_assign_timeout(unsigned long data)
37 int rc; 37 int rc;
38 38
39 request = (struct tape_request *) data; 39 request = (struct tape_request *) data;
40 if ((device = request->device) == NULL) 40 device = request->device;
41 BUG(); 41 BUG_ON(!device);
42 42
43 DBF_EVENT(3, "%08x: Assignment timeout. Device busy.\n", 43 DBF_EVENT(3, "%08x: Assignment timeout. Device busy.\n",
44 device->cdev_id); 44 device->cdev_id);