From 77044a1c6aab6f7466a41d3c7d6e9e4ad74aeda0 Mon Sep 17 00:00:00 2001 From: Shaun Ruffell Date: Fri, 27 May 2011 16:48:46 +0000 Subject: Move test for DEFINE_SPINLOCK into include/dahdi/kernel.h The check for DEFINE_SPINLOCK was spread throughout the source tree. If not defined we can just define it in inlucde/dahdi/kernel.h. Now include/dahdi/kernel.h is the only place that references SPIN_LOCK_UNLOCKED (which breaks lockdep checking if DEFINE_SPINLOCK is otherwise defined in the kernel). Signed-off-by: Shaun Ruffell Acked-by: Kinsey Moore Acked-by: Russ Meyerriecks Acked-by: Tzafrir Cohen Review: https://reviewboard.asterisk.org/r/940/ Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=9411 git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/branches/2.4@9924 a0bf4364-ded3-4de4-8d8a-66a801d63aff --- drivers/dahdi/dahdi_dynamic.c | 5 ----- 1 file changed, 5 deletions(-) (limited to 'drivers/dahdi/dahdi_dynamic.c') diff --git a/drivers/dahdi/dahdi_dynamic.c b/drivers/dahdi/dahdi_dynamic.c index 31a6c30..f0b61ff 100644 --- a/drivers/dahdi/dahdi_dynamic.c +++ b/drivers/dahdi/dahdi_dynamic.c @@ -113,13 +113,8 @@ struct dahdi_dynamic { struct list_head list; }; -#ifdef DEFINE_SPINLOCK static DEFINE_SPINLOCK(dspan_lock); static DEFINE_SPINLOCK(driver_lock); -#else -static spinlock_t dspan_lock = SPIN_LOCK_UNLOCKED; -static spinlock_t driver_lock = SPIN_LOCK_UNLOCKED; -#endif static LIST_HEAD(dspan_list); static LIST_HEAD(driver_list); -- cgit v1.2.3