diff options
| author | Shaun Ruffell <sruffell@digium.com> | 2009-12-22 17:53:36 +0000 |
|---|---|---|
| committer | Shaun Ruffell <sruffell@digium.com> | 2009-12-22 17:53:36 +0000 |
| commit | 4cbf5f365563fec7434077eda232f7f80848cb28 (patch) | |
| tree | 328c296cf3f2f5daa4343329959ea3266998c8f0 | |
| parent | 323d34b88b9d2b86d5e8dc0abe1b29e4ffb77fc5 (diff) | |
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.
........
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/branches/2.2@7723 a0bf4364-ded3-4de4-8d8a-66a801d63aff
| -rw-r--r-- | drivers/dahdi/voicebus/voicebus.c | 2 | ||||
| -rw-r--r-- | drivers/dahdi/wcte12xp/base.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dahdi/voicebus/voicebus.c b/drivers/dahdi/voicebus/voicebus.c index 70a1128..b77ccdb 100644 --- a/drivers/dahdi/voicebus/voicebus.c +++ b/drivers/dahdi/voicebus/voicebus.c @@ -1733,7 +1733,7 @@ voicebus_init(struct pci_dev *pdev, u32 framesize, const char *board_name, * 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); diff --git a/drivers/dahdi/wcte12xp/base.c b/drivers/dahdi/wcte12xp/base.c index 5a730af..2438fb3 100644 --- a/drivers/dahdi/wcte12xp/base.c +++ b/drivers/dahdi/wcte12xp/base.c @@ -1901,7 +1901,7 @@ static int __init te12xp_init(void) #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); |