Commit 21a43e39 authored May 10, 2011 by David Rientjes Committed by Linus Torvalds May 10, 2011

slub: Revert "[PARISC] slub: fix panic with DISCONTIGMEM"



This reverts commit 4a5fa359, 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
d9b41e0b ("[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>

parent 54b33352

init/Kconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -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

Admin message