diff options
| author | sruffell <sruffell@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2009-08-13 20:18:56 +0000 |
|---|---|---|
| committer | sruffell <sruffell@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2009-08-13 20:18:56 +0000 |
| commit | 4703ef88e5af411446882d640b1a8fd4d3f9c5cf (patch) | |
| tree | 5d1a0a8ce923eb9b1603ec1dff47e12bba5d6891 | |
| parent | 2e38e446f96c464d53d9e99a3c88ac79156901b5 (diff) | |
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
| -rw-r--r-- | kernel/xpp/xpp_usb.c | 2 |
1 files changed, 1 insertions, 1 deletions
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, |