[dahdi-commits] sruffell: branch linux/2.5 r10528 - /linux/branches/2.5/drivers/dahdi/xpp/xpd.h

SVN commits to the DAHDI project dahdi-commits at lists.digium.com
Fri Mar 16 11:11:46 CDT 2012


Author: sruffell
Date: Fri Mar 16 11:11:43 2012
New Revision: 10528

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=10528
Log:
xpp: Use 'bool' type for boolean module parameters on kernel versions >= 2.6.31.

Eliminates warnings that are a result of upstream commit 72db395ffa
"module_param: check that bool parameters really are bool."

Signed-off-by: Shaun Ruffell <sruffell at digium.com>
Acked-by: Tzafrir Cohen <tzafrir.cohen at xorcom.com>

Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=10484

Conflicts:

	drivers/dahdi/xpp/xpd.h

Modified:
    linux/branches/2.5/drivers/dahdi/xpp/xpd.h

Modified: linux/branches/2.5/drivers/dahdi/xpp/xpd.h
URL: http://svnview.digium.com/svn/dahdi/linux/branches/2.5/drivers/dahdi/xpp/xpd.h?view=diff&rev=10528&r1=10527&r2=10528
==============================================================================
--- linux/branches/2.5/drivers/dahdi/xpp/xpd.h (original)
+++ linux/branches/2.5/drivers/dahdi/xpp/xpd.h Fri Mar 16 11:11:43 2012
@@ -49,6 +49,7 @@
 #endif
 #endif
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
 /*
  * FIXME: Kludge for 2.6.19
  * bool is now defined as a proper boolean type (gcc _Bool)
@@ -58,6 +59,12 @@
 	int name = init;	\
 	module_param(name, bool, perm);		\
 	MODULE_PARM_DESC(name, desc " [default " #init "]")
+#else
+#define	DEF_PARM_BOOL(name, init, perm, desc) \
+	bool name = init; \
+	module_param(name, bool, perm); \
+	MODULE_PARM_DESC(name, desc " [default " #init "]")
+#endif
 
 #define	DEF_PARM(type,name,init,perm,desc)	\
 	type name = init;	\




More information about the dahdi-commits mailing list