[svn-commits] sruffell: branch linux/2.2 r7723 - in /linux/branches/2.2: ./ drivers/dahdi/v...

[SVN commits to the Digium repositories]

Author: sruffell
Date: Tue Dec 22 11:53:36 2009
New Revision: 7723

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=7723
Log:
Merged revisions 7722 via svnmerge from 
https://origsvn.digium.com/svn/dahdi/linux/trunk

........
  r7722 | sruffell | 2009-12-22 11:50:25 -0600 (Tue, 22 Dec 2009) | 5 lines
  
  voicebus, wcte12xp: Only define SLAB_STORE_USER when CONFIG_SLUB is defined.
  
  On 2.6.22, there is was a bug in the SLUB allocator that required defining
  SLAB_STORE_USER, however this setting is only valid when CONFIG_SLUB is defined
  and not when using the previous slab allocator. DAHDI-424.
........

Modified:
    linux/branches/2.2/   (props changed)
    linux/branches/2.2/drivers/dahdi/voicebus/voicebus.c
    linux/branches/2.2/drivers/dahdi/wcte12xp/base.c

Propchange: linux/branches/2.2/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: linux/branches/2.2/drivers/dahdi/voicebus/voicebus.c
URL: http://svnview.digium.com/svn/dahdi/linux/branches/2.2/drivers/dahdi/voicebus/voicebus.c?view=diff&rev=7723&r1=7722&r2=7723
==============================================================================
--- linux/branches/2.2/drivers/dahdi/voicebus/voicebus.c (original)
+++ linux/branches/2.2/drivers/dahdi/voicebus/voicebus.c Tue Dec 22 11:53:36 2009
@@ -1733,7 +1733,7 @@
 	 * 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)
+#if defined(CONFIG_SLUB) && (LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 22))
 				SLAB_HWCACHE_ALIGN | SLAB_STORE_USER, NULL, NULL);
 #else
 				SLAB_HWCACHE_ALIGN, NULL, NULL);

Modified: linux/branches/2.2/drivers/dahdi/wcte12xp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/branches/2.2/drivers/dahdi/wcte12xp/base.c?view=diff&rev=7723&r1=7722&r2=7723
==============================================================================
--- linux/branches/2.2/drivers/dahdi/wcte12xp/base.c (original)
+++ linux/branches/2.2/drivers/dahdi/wcte12xp/base.c Tue Dec 22 11:53:36 2009
@@ -1901,7 +1901,7 @@
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23)
 	cmd_cache = kmem_cache_create(THIS_MODULE->name, sizeof(struct command), 0,
-#if LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 22)
+#if defined(CONFIG_SLUB) && (LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 22))
 				SLAB_HWCACHE_ALIGN | SLAB_STORE_USER, NULL, NULL);
 #else
 				SLAB_HWCACHE_ALIGN, NULL, NULL);