diff options
| author | Herbert Pötzl <herbert@13thfloor.at> | 2005-02-01 16:50:23 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-02-01 16:50:23 -0800 |
| commit | 68b38741bc278d276a3989b23faa03ecf086d142 (patch) | |
| tree | 4f33a612955749c9d94e35fa0109b011305f8a44 /kernel | |
| parent | d15f98e5efd90373c4767dc7f6a95f32c852353d (diff) | |
[PATCH] assert_spin_locked()
Consolidate the various private implementations of this into a kernel-wide
implementation.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sched.c | 2 | ||||
| -rw-r--r-- | kernel/signal.c | 10 |
2 files changed, 3 insertions, 9 deletions
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)) |