[svn-commits] sruffell: linux/trunk r6995 - /linux/trunk/drivers/dahdi/xpp/xpp_usb.c

[SVN commits to the Digium repositories]

Author: sruffell
Date: Thu Aug 13 15:25:16 2009
New Revision: 6995

URL: http://svn.asterisk.org/svn-view/dahdi?view=rev&rev=6995
Log:
xpp: Only define SLAB_STORE_USER on 2.6.22 if CONFIG_SLUB is set.

Prevents a crash on 2.6.22 when CONFIG_SLAB is set and CONFIG_SLAB_DEBUG is
not.

Modified:
    linux/trunk/drivers/dahdi/xpp/xpp_usb.c

Modified: linux/trunk/drivers/dahdi/xpp/xpp_usb.c
URL: http://svn.asterisk.org/svn-view/dahdi/linux/trunk/drivers/dahdi/xpp/xpp_usb.c?view=diff&rev=6995&r1=6994&r2=6995
==============================================================================
--- linux/trunk/drivers/dahdi/xpp/xpp_usb.c (original)
+++ linux/trunk/drivers/dahdi/xpp/xpp_usb.c Thu Aug 13 15:25:16 2009
@@ -975,7 +975,7 @@
 	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)
+#if (LINUX_VERSION_CODE == KERNEL_VERSION(2,6,22)) && defined(CONFIG_SLUB)
 			0, SLAB_STORE_USER,
 #else
 			0, 0,