aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorEric Sesterhenn <snakebyte@gmx.de>2006-06-23 05:06:06 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-23 10:43:08 -0400
commit125e18745f16685f69a34fd6130d47598fc4bf54 (patch)
treec97ed94b0525a572efa1bd4990a55b18be5d781d /kernel
parent78ce89c92bc6eaf5933b5664bff64253a7103bd7 (diff)
[PATCH] More BUG_ON conversion
Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de> Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Cc: Bartlomiej Zolnierkiewicz <B.Zolnierkiewicz@elka.pw.edu.pl> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Cc: James Bottomley <James.Bottomley@steeleye.com> Acked-by: "Salyzyn, Mark" <mark_salyzyn@adaptec.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/exit.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel/exit.c b/kernel/exit.c
index e06d0c10a24e..a3baf92462bd 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -579,7 +579,7 @@ static void exit_mm(struct task_struct * tsk)
579 down_read(&mm->mmap_sem); 579 down_read(&mm->mmap_sem);
580 } 580 }
581 atomic_inc(&mm->mm_count); 581 atomic_inc(&mm->mm_count);
582 if (mm != tsk->active_mm) BUG(); 582 BUG_ON(mm != tsk->active_mm);
583 /* more a memory barrier than a real lock */ 583 /* more a memory barrier than a real lock */
584 task_lock(tsk); 584 task_lock(tsk);
585 tsk->mm = NULL; 585 tsk->mm = NULL;
@@ -1530,8 +1530,7 @@ check_continued:
1530 if (options & __WNOTHREAD) 1530 if (options & __WNOTHREAD)
1531 break; 1531 break;
1532 tsk = next_thread(tsk); 1532 tsk = next_thread(tsk);
1533 if (tsk->signal != current->signal) 1533 BUG_ON(tsk->signal != current->signal);
1534 BUG();
1535 } while (tsk != current); 1534 } while (tsk != current);
1536 1535
1537 read_unlock(&tasklist_lock); 1536 read_unlock(&tasklist_lock);