diff options
| author | Shaun Ruffell <sruffell@digium.com> | 2010-02-10 01:15:20 +0000 |
|---|---|---|
| committer | Shaun Ruffell <sruffell@digium.com> | 2010-02-10 01:15:20 +0000 |
| commit | 719d54d99a09ed5a274947a782c9d33d11c3b94c (patch) | |
| tree | 1cda33decebee3482b20bb3281022088fbe5d978 | |
| parent | 67f36b02c107d6d164b6744122b668eb1394e9bc (diff) | |
dahdi-base: Convert fatal_signal_pending from inline into macro.
This symbol first shows up in kernel version 2.6.25, but some distros have it
back ported into their tree.
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@8018 a0bf4364-ded3-4de4-8d8a-66a801d63aff
| -rw-r--r-- | include/dahdi/kernel.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h index 09fa196..1d75245 100644 --- a/include/dahdi/kernel.h +++ b/include/dahdi/kernel.h @@ -1177,10 +1177,12 @@ 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); -} + +/* Some distributions backported fatal_signal_pending so we'll use a macro to + * override the inline functino definition. */ +#define fatal_signal_pending(p) \ + (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) { |