summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorEric Sesterhenn <snakebyte@gmx.de>2006-04-02 13:44:47 +0200
committerAdrian Bunk <bunk@stusta.de>2006-04-02 13:44:47 +0200
commitfda8bd78a15950b9b01a1c1477a9095cb08c27c1 (patch)
tree362ca651ed8fdf046c4755c8d96cd4957ecdf1eb /kernel
parent524223ca8142d593124bde66f3ffa1deb6f56c06 (diff)
downloadlwn-fda8bd78a15950b9b01a1c1477a9095cb08c27c1.tar.gz
lwn-fda8bd78a15950b9b01a1c1477a9095cb08c27c1.zip
BUG_ON() Conversion in kernel/signal.c
this changes if() BUG(); constructs to BUG_ON() which is cleaner, contains unlikely() and can better optimized away. Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de> Signed-off-by: Adrian Bunk <bunk@stusta.de>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/signal.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/kernel/signal.c b/kernel/signal.c
index 92025b108791..5ccaac505e8d 100644
--- a/kernel/signal.c
+++ b/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;
}