From: James Bottomley Date: Tue, 19 Apr 2011 21:29:36 +0000 (-0500) Subject: slub: fix panic with DISCONTIGMEM X-Git-Tag: v2.6.34.11~99 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b06b815212371a592c2df428a97bf6e3b57ff9ec;p=thirdparty%2Fkernel%2Fstable.git slub: fix panic with DISCONTIGMEM commit 4a5fa3590f09999f6db41bc386bce40848fa9f63 upstream. Slub makes assumptions about page_to_nid() which are violated by DISCONTIGMEM and !NUMA. This violation results in a panic because page_to_nid() can be non-zero for pages in the discontiguous ranges and this leads to a null return by get_node(). The assertion by the maintainer is that DISCONTIGMEM should only be allowed when NUMA is also defined. However, at least six architectures: alpha, ia64, m32r, m68k, mips, parisc violate this. The panic is a regression against slab, so just mark slub broken in the problem configuration to prevent users reporting these panics. Acked-by: David Rientjes Acked-by: Pekka Enberg Signed-off-by: James Bottomley Signed-off-by: Paul Gortmaker --- diff --git a/init/Kconfig b/init/Kconfig index 5fe94b82e4c0a..04e486cfbcac2 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1052,6 +1052,7 @@ config SLAB per cpu and per node queues. config SLUB + depends on BROKEN || NUMA || !DISCONTIGMEM bool "SLUB (Unqueued Allocator)" help SLUB is a slab allocator that minimizes cache line usage