From 136185314551006bd4e03e359537678b4ab5c5ac Mon Sep 17 00:00:00 2001 From: Shaun Ruffell Date: Fri, 24 Sep 2010 22:44:53 +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/ git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9411 a0bf4364-ded3-4de4-8d8a-66a801d63aff --- include/dahdi/kernel.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'include/dahdi') diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h index 7e4e254..597e139 100644 --- a/include/dahdi/kernel.h +++ b/include/dahdi/kernel.h @@ -1262,6 +1262,10 @@ wait_for_completion_timeout(struct completion *x, unsigned long timeout) #endif /* 2.6.26 */ #endif /* 2.6.31 */ +#ifndef DEFINE_SPINLOCK +#define DEFINE_SPINLOCK(x) spinlock_t x = SPIN_LOCK_UNLOCKED +#endif + #ifndef DMA_BIT_MASK #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) #endif -- cgit v1.2.3