From bd937554fd595cdd58ce9161bdbe9640774ed86d Mon Sep 17 00:00:00 2001 From: Eric Sesterhenn Date: Sun, 2 Apr 2006 13:44:47 +0200 Subject: [PATCH] --- yaml --- r: 25223 b: refs/heads/master c: fda8bd78a15950b9b01a1c1477a9095cb08c27c1 h: refs/heads/master i: 25221: 734af4801ab02304560a902ec1cee15c351de6b5 25219: 7bcc90a644cbff8df2c0001aed4d020f534bc46b 25215: 00b7f90fb366fe6da8890c6c59ba8d52da21f818 v: v3 --- [refs] | 2 +- trunk/kernel/signal.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 23d16817bf6c..c8745826b62c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 524223ca8142d593124bde66f3ffa1deb6f56c06 +refs/heads/master: fda8bd78a15950b9b01a1c1477a9095cb08c27c1 diff --git a/trunk/kernel/signal.c b/trunk/kernel/signal.c index 92025b108791..5ccaac505e8d 100644 --- a/trunk/kernel/signal.c +++ b/trunk/kernel/signal.c @@ -769,8 +769,7 @@ specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t) { int ret = 0; - if (!irqs_disabled()) - BUG(); + BUG_ON(!irqs_disabled()); assert_spin_locked(&t->sighand->siglock); /* Short-circuit ignored signals. */ @@ -1384,8 +1383,7 @@ send_group_sigqueue(int sig, struct sigqueue *q, struct task_struct *p) * the overrun count. Other uses should not try to * send the signal multiple times. */ - if (q->info.si_code != SI_TIMER) - BUG(); + BUG_ON(q->info.si_code != SI_TIMER); q->info.si_overrun++; goto out; }