From 4703ef88e5af411446882d640b1a8fd4d3f9c5cf Mon Sep 17 00:00:00 2001 From: sruffell Date: Thu, 13 Aug 2009 20:18:56 +0000 Subject: 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. git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@4676 5390a7c7-147a-4af0-8ec9-7488f05a26cb --- kernel/xpp/xpp_usb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/xpp/xpp_usb.c b/kernel/xpp/xpp_usb.c index 525f777..aebac2b 100644 --- a/kernel/xpp/xpp_usb.c +++ b/kernel/xpp/xpp_usb.c @@ -975,7 +975,7 @@ static int __init xpp_usb_init(void) 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, -- cgit v1.2.3