From 68b38741bc278d276a3989b23faa03ecf086d142 Mon Sep 17 00:00:00 2001 From: Herbert Pötzl Date: Tue, 1 Feb 2005 16:50:23 -0800 Subject: [PATCH] assert_spin_locked() Consolidate the various private implementations of this into a kernel-wide implementation. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- kernel/sched.c | 2 +- kernel/signal.c | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) (limited to 'kernel') diff --git a/kernel/sched.c b/kernel/sched.c index f8d9af57ca36..3cb1b2a6b521 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -778,7 +778,7 @@ static void resched_task(task_t *p) { int need_resched, nrpolling; - BUG_ON(!spin_is_locked(&task_rq(p)->lock)); + assert_spin_locked(&task_rq(p)->lock); /* minimise the chance of sending an interrupt to poll_idle() */ nrpolling = test_tsk_thread_flag(p,TIF_POLLING_NRFLAG); diff --git a/kernel/signal.c b/kernel/signal.c index d98e9624ea30..9e87ab3f8f21 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -847,10 +847,7 @@ specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t) if (!irqs_disabled()) BUG(); -#ifdef CONFIG_SMP - if (!spin_is_locked(&t->sighand->siglock)) - BUG(); -#endif + assert_spin_locked(&t->sighand->siglock); if (((unsigned long)info > 2) && (info->si_code == SI_TIMER)) /* @@ -1044,10 +1041,7 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p) { int ret = 0; -#ifdef CONFIG_SMP - if (!spin_is_locked(&p->sighand->siglock)) - BUG(); -#endif + assert_spin_locked(&p->sighand->siglock); handle_stop_signal(sig, p); if (((unsigned long)info > 2) && (info->si_code == SI_TIMER)) -- cgit v1.2.3