aboutsummaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorJames Bottomley <James.Bottomley@HansenPartnership.com>2011-04-19 16:29:36 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2011-05-02 09:19:43 -0700
commit7c650d5dfafac48213c0a652b7b1a18a3c391538 (patch)
tree1b51e2138dbaacafbc34701f522e29c193277bd7 /init
parent2aaf1f781cb77812e5d9678d7b126ec13cebf283 (diff)
downloadlinux-2.6.38-lt-ux500-7c650d5dfafac48213c0a652b7b1a18a3c391538.tar.gz
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 <rientjes@google.com> Acked-by: Pekka Enberg <penberg@kernel.org> Signed-off-by: James Bottomley <James.Bottomley@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig
index be788c0957d..47dd02f4d9c 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1209,6 +1209,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