Prev: [097/200] m68k: set ARCH_KMALLOC_MINALIGN
Next: [039/200] USB: tty: fix incorrect use of tty_insert_flip_string_fixed_flag
From: Greg KH on 1 Jul 2010 17:50
2.6.34-stable review patch. If anyone has any objections, please let me know.

------------------

From: Christoph Lameter <cl(a)linux-foundation.org>

commit 0f1f694260e0d35b5ce7d471f6e679c3dd4d7d94 upstream.

Commit 756dee75872a2a764b478e18076360b8a4ec9045 ("SLUB: Get rid of dynamic DMA
kmalloc cache allocation") makes S390 run out of kmalloc caches. Increase the
number of kmalloc caches to a safe size.

Reported-by: Heiko Carstens <heiko.carstens(a)de.ibm.com>
Tested-by: Heiko Carstens <heiko.carstens(a)de.ibm.com>
Signed-off-by: Christoph Lameter <cl(a)linux-foundation.org>
Signed-off-by: Pekka Enberg <penberg(a)cs.helsinki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de>

---
include/linux/slub_def.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- a/include/linux/slub_def.h
+++ b/include/linux/slub_def.h
@@ -132,7 +132,7 @@ struct kmem_cache {
#ifdef CONFIG_ZONE_DMA
#define SLUB_DMA __GFP_DMA
/* Reserve extra caches for potential DMA use */
-#define KMALLOC_CACHES (2 * SLUB_PAGE_SHIFT - 6)
+#define KMALLOC_CACHES (2 * SLUB_PAGE_SHIFT)
#else
/* Disable DMA functionality */
#define SLUB_DMA (__force gfp_t)0


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [097/200] m68k: set ARCH_KMALLOC_MINALIGN
Next: [039/200] USB: tty: fix incorrect use of tty_insert_flip_string_fixed_flag