From 972195bd6c675308c18b12447163ca58e6856afa Mon Sep 17 00:00:00 2001 From: Shaun Ruffell Date: Mon, 8 Feb 2010 22:49:34 +0000 Subject: wctdm24xxp, wcte12xp: Abort the search for modules if killed. If the user kills the modprobe process that is initializing the modules, exit as soon as possible and do not look for any other modules. git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@8007 a0bf4364-ded3-4de4-8d8a-66a801d63aff --- include/dahdi/kernel.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'include/dahdi') diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h index 96c4076..9d87728 100644 --- a/include/dahdi/kernel.h +++ b/include/dahdi/kernel.h @@ -1176,6 +1176,11 @@ static inline short dahdi_txtone_nextsample(struct dahdi_chan *ss) #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31) #define KERN_CONT "" +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25) +static inline int fatal_signal_pending(struct task_struct *p) +{ + return signal_pending(p) && sigismember(&p->pending.signal, SIGKILL); +} #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18) static inline void list_replace(struct list_head *old, struct list_head *new) { @@ -1202,6 +1207,7 @@ wait_for_completion_timeout(struct completion *x, unsigned long timeout) #endif /* 2.6.11 */ #endif /* 2.6.14 */ #endif /* 2.6.18 */ +#endif /* 2.6.25 */ #endif /* 2.6.31 */ #ifndef DMA_BIT_MASK -- cgit v1.2.3