[zaptel-commits] sruffell: branch 1.4 r4676 - /branches/1.4/kernel/xpp/xpp_usb.c

[SVN commits to the Zaptel project]

Author: sruffell
Date: Thu Aug 13 15:18:56 2009
New Revision: 4676

URL: http://svn.asterisk.org/svn-view/zaptel?view=rev&rev=4676
Log:
xpp: On 2.6.22 only define CONFIG_STORE_USER when CONFIG_SLUB is defined.

When CONFIG_SLAB is defined, but CONFIG_SLAB_DEBUG is not, you will get a
kernel oops when loading the driver if CONFIG_STORE_USER is defined.

Modified:
    branches/1.4/kernel/xpp/xpp_usb.c

Modified: branches/1.4/kernel/xpp/xpp_usb.c
URL: http://svn.asterisk.org/svn-view/zaptel/branches/1.4/kernel/xpp/xpp_usb.c?view=diff&rev=4676&r1=4675&r2=4676
==============================================================================
--- branches/1.4/kernel/xpp/xpp_usb.c (original)
+++ branches/1.4/kernel/xpp/xpp_usb.c Thu Aug 13 15:18:56 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,