[dahdi-commits] wendell: linux/trunk r6096 - in /linux/trunk/drivers/dahdi: ./ wctc4xxp/ xpp/

[SVN commits to the DAHDI project]

Author: wendell
Date: Fri Mar  6 15:43:34 2009
New Revision: 6096

URL: http://svn.digium.com/svn-view/dahdi?view=rev&rev=6096
Log:
Workarounds for SLUB sysfs problems in kernel 2.6.22 with CONFIG_SLUB and CONFIG_SLUB_DEBUG, as in Fedora Core 6.
Fixes kernel oops when loading/unloading dahdi modules. DAHDI-226

Modified:
    linux/trunk/drivers/dahdi/voicebus.c
    linux/trunk/drivers/dahdi/wctc4xxp/base.c
    linux/trunk/drivers/dahdi/xpp/xpp_usb.c

Modified: linux/trunk/drivers/dahdi/voicebus.c
URL: http://svn.digium.com/svn-view/dahdi/linux/trunk/drivers/dahdi/voicebus.c?view=diff&rev=6096&r1=6095&r2=6096
==============================================================================
--- linux/trunk/drivers/dahdi/voicebus.c (original)
+++ linux/trunk/drivers/dahdi/voicebus.c Fri Mar  6 15:43:34 2009
@@ -1385,7 +1385,11 @@
 	 * this driver. */
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
 	vb->buffer_cache = kmem_cache_create(board_name, vb->framesize, 0, 
+#if LINUX_VERSION_CODE == KERNEL_VERSION(2,6,22)
+				SLAB_HWCACHE_ALIGN | SLAB_STORE_USER, NULL, NULL);
+#else
 				SLAB_HWCACHE_ALIGN, NULL, NULL);
+#endif
 #else
 	vb->buffer_cache = kmem_cache_create(board_name, vb->framesize, 0, 
 				SLAB_HWCACHE_ALIGN, NULL);

Modified: linux/trunk/drivers/dahdi/wctc4xxp/base.c
URL: http://svn.digium.com/svn-view/dahdi/linux/trunk/drivers/dahdi/wctc4xxp/base.c?view=diff&rev=6096&r1=6095&r2=6096
==============================================================================
--- linux/trunk/drivers/dahdi/wctc4xxp/base.c (original)
+++ linux/trunk/drivers/dahdi/wctc4xxp/base.c Fri Mar  6 15:43:34 2009
@@ -3375,13 +3375,17 @@
 static int __init wctc4xxp_init(void)
 {
 	int res;
-#	if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
 	cmd_cache = kmem_cache_create(THIS_MODULE->name, sizeof(struct tcb), 0, 
+#if LINUX_VERSION_CODE == KERNEL_VERSION(2,6,22)
+	                              SLAB_HWCACHE_ALIGN | SLAB_STORE_USER, NULL, NULL);
+#else
 	                              SLAB_HWCACHE_ALIGN, NULL, NULL);
-#	else
+#endif
+#else
 	cmd_cache = kmem_cache_create(THIS_MODULE->name, sizeof(struct tcb), 0, 
 	                              SLAB_HWCACHE_ALIGN, NULL);
-#	endif
+#endif
 	
 	if (!cmd_cache) {
 		return -ENOMEM;

Modified: linux/trunk/drivers/dahdi/xpp/xpp_usb.c
URL: http://svn.digium.com/svn-view/dahdi/linux/trunk/drivers/dahdi/xpp/xpp_usb.c?view=diff&rev=6096&r1=6095&r2=6096
==============================================================================
--- linux/trunk/drivers/dahdi/xpp/xpp_usb.c (original)
+++ linux/trunk/drivers/dahdi/xpp/xpp_usb.c Fri Mar  6 15:43:34 2009
@@ -975,7 +975,11 @@
 	INFO("revision %s\n", XPP_VERSION);
 	xusb_cache = kmem_cache_create("xusb_cache",
 			sizeof(xframe_t) + XFRAME_DATASIZE,
+#if LINUX_VERSION_CODE == KERNEL_VERSION(2,6,22)
+			0, SLAB_STORE_USER,
+#else
 			0, 0,
+#endif
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
 			NULL, 
 #endif