diff options
author | Shaun Ruffell <sruffell@digium.com> | 2010-09-24 22:44:53 +0000 |
---|---|---|
committer | Shaun Ruffell <sruffell@digium.com> | 2010-09-24 22:44:53 +0000 |
commit | 38f944fd9ccce0d29b33e6599165b2b8c6964d08 (patch) | |
tree | eaba3cdebac7179a46a49b0c58a5beb26962d894 /drivers/dahdi/dahdi_dynamic_ethmf.c | |
parent | 12cde3e200321dc88e979ba2cbe7c33cc154f161 (diff) |
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 <sruffell@digium.com>
Acked-by: Kinsey Moore <kmoore@digium.com>
Acked-by: Russ Meyerriecks <rmeyerriecks@digium.com>
Acked-by: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
Review: https://reviewboard.asterisk.org/r/940/
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9411 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi/dahdi_dynamic_ethmf.c')
-rw-r--r-- | drivers/dahdi/dahdi_dynamic_ethmf.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/dahdi/dahdi_dynamic_ethmf.c b/drivers/dahdi/dahdi_dynamic_ethmf.c index f8670c8..126001f 100644 --- a/drivers/dahdi/dahdi_dynamic_ethmf.c +++ b/drivers/dahdi/dahdi_dynamic_ethmf.c @@ -129,11 +129,7 @@ struct ztdeth { /** * Lock for adding and removing items in ethmf_list */ -#ifdef DEFINE_SPINLOCK static DEFINE_SPINLOCK(ethmf_lock); -#else -static spinlock_t ethmf_lock = SPIN_LOCK_UNLOCKED; -#endif /** * The active list of all running spans @@ -401,7 +397,7 @@ static int ztdethmf_transmit(void *pvt, unsigned char *msg, int msglen) unsigned char addr[ETH_ALEN]; int spans_ready = 0, index = 0; #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 10) - static spinlock_t lock = SPIN_LOCK_UNLOCKED; + static DEFINE_SPINLOCK(lock); unsigned long flags; #endif |