diff options
author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2011-04-19 17:29:36 -0400 |
---|---|---|
committer | James Bottomley <James.Bottomley@suse.de> | 2011-04-22 16:42:46 -0400 |
commit | 4a5fa3590f09999f6db41bc386bce40848fa9f63 (patch) | |
tree | cf1c92a448b30cf1f18330798a8060d47023a6fc /init | |
parent | d9b41e0b54fd7e164daf1e9c539c1070398aa02e (diff) |
[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/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig index 56240e724d9a..a7ad8fbdb564 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
@@ -1226,6 +1226,7 @@ config SLAB | |||
1226 | per cpu and per node queues. | 1226 | per cpu and per node queues. |
1227 | 1227 | ||
1228 | config SLUB | 1228 | config SLUB |
1229 | depends on BROKEN || NUMA || !DISCONTIGMEM | ||
1229 | bool "SLUB (Unqueued Allocator)" | 1230 | bool "SLUB (Unqueued Allocator)" |
1230 | help | 1231 | help |
1231 | SLUB is a slab allocator that minimizes cache line usage | 1232 | SLUB is a slab allocator that minimizes cache line usage |