diff options
| author | David Rientjes <rientjes@google.com> | 2011-05-10 20:08:54 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-10 20:37:34 -0400 |
| commit | 21a43e397e7f66d3be44e09b54045f1a67838cc0 (patch) | |
| tree | 8650915c69016ff223f9b73866a249d4dd95f451 /init | |
| parent | 54b333529df25b21da462c7dcc16c7dc779d9f26 (diff) | |
slub: Revert "[PARISC] slub: fix panic with DISCONTIGMEM"
This reverts commit 4a5fa3590f09, which did not allow SLUB to be used
on architectures that use DISCONTIGMEM without compiling NUMA support
without CONFIG_BROKEN also set.
The slub panic that it was intended to prevent is addressed by
d9b41e0b54fd ("[PARISC] set memory ranges in N_NORMAL_MEMORY when
onlined") on parisc so there is no further slub issues with such a
configuration.
The reverts allows SLUB now to be used on such architectures since
there haven't been any reports of additional errors.
Cc: James Bottomley <James.Bottomley@suse.de>
Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/init/Kconfig b/init/Kconfig index d886b1e9278e..7a71e0a9992a 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
| @@ -1226,7 +1226,6 @@ 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 | ||
| 1230 | bool "SLUB (Unqueued Allocator)" | 1229 | bool "SLUB (Unqueued Allocator)" |
| 1231 | help | 1230 | help |
| 1232 | SLUB is a slab allocator that minimizes cache line usage | 1231 | SLUB is a slab allocator that minimizes cache line usage |