aboutsummaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorJames Bottomley <James.Bottomley@HansenPartnership.com>2011-04-19 16:29:36 -0500
committerJames Bottomley <James.Bottomley@suse.de>2011-04-22 15:42:46 -0500
commit4a5fa3590f09999f6db41bc386bce40848fa9f63 (patch)
treecf1c92a448b30cf1f18330798a8060d47023a6fc /init
parentd9b41e0b54fd7e164daf1e9c539c1070398aa02e (diff)
downloadkernel_samsung_smdk4412-4a5fa3590f09999f6db41bc386bce40848fa9f63.zip
kernel_samsung_smdk4412-4a5fa3590f09999f6db41bc386bce40848fa9f63.tar.gz
kernel_samsung_smdk4412-4a5fa3590f09999f6db41bc386bce40848fa9f63.tar.bz2
[PARISC] slub: fix panic with DISCONTIGMEM
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. Cc: stable@kernel.org Acked-by: David Rientjes <rientjes@google.com> Acked-by: Pekka Enberg <penberg@kernel.org> Signed-off-by: James Bottomley <James.Bottomley@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 56240e7..a7ad8fb 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1226,6 +1226,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