Skip to content

Commit

Permalink
slub: Revert "[PARISC] slub: fix panic with DISCONTIGMEM"
Browse files Browse the repository at this point in the history
This reverts commit 4a5fa35, 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
d9b41e0 ("[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 <[email protected]>
Signed-off-by: David Rientjes <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
rientjes authored and torvalds committed May 11, 2011
1 parent 54b3335 commit 21a43e3
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion init/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -1226,7 +1226,6 @@ 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
Expand Down

0 comments on commit 21a43e3

Please sign in to comment.