[svn-commits] sruffell: linux/trunk r8018 - /linux/trunk/include/dahdi/kernel.h

[SVN commits to the Digium repositories]

Author: sruffell
Date: Tue Feb  9 19:15:20 2010
New Revision: 8018

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=8018
Log:
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.

Modified:
    linux/trunk/include/dahdi/kernel.h

Modified: linux/trunk/include/dahdi/kernel.h
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/include/dahdi/kernel.h?view=diff&rev=8018&r1=8017&r2=8018
==============================================================================
--- linux/trunk/include/dahdi/kernel.h (original)
+++ linux/trunk/include/dahdi/kernel.h Tue Feb  9 19:15:20 2010
@@ -1177,10 +1177,12 @@
 #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)
 {