[zaptel-commits] tzafrir: branch 1.4 r2288 - in /branches/1.4: ./ xpp/xpd.h

[zaptel-commits at lists.digium.com]

Author: tzafrir
Date: Mon Mar  5 11:02:20 2007
New Revision: 2288

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2288
Log:
Found a proper "marker" for the gfp_t typedef. Now every 2.6.9 is supported.

r2286 | tzafrir | 2007-03-05 18:14:11 +0200 (Mon, 05 Mar 2007) | 2 lines

Modified:
    branches/1.4/   (props changed)
    branches/1.4/xpp/xpd.h

Propchange: branches/1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: branches/1.4/xpp/xpd.h
URL: http://svn.digium.com/view/zaptel/branches/1.4/xpp/xpd.h?view=diff&rev=2288&r1=2287&r2=2288
==============================================================================
--- branches/1.4/xpp/xpd.h (original)
+++ branches/1.4/xpp/xpd.h Mon Mar  5 11:02:20 2007
@@ -46,8 +46,8 @@
 
 #ifdef __KERNEL__
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
-/* pretend every 2.6.9 is later RHEL */
-#if LINUX_VERSION_CODE != KERNEL_VERSION(2,6,9) 
+/* also added in RHEL kernels with the OpenInfiniband backport: */
+#if LINUX_VERSION_CODE != KERNEL_VERSION(2,6,9) || !defined(DEFINE_SPINLOCK)
 typedef	unsigned gfp_t;		/* Added in 2.6.14 */
 #endif
 #endif