slub: Revert "[PARISC] slub: fix panic with DISCONTIGMEM"
authorDavid Rientjes <rientjes@google.com>
Wed, 11 May 2011 00:08:54 +0000 (17:08 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 11 May 2011 00:37:34 +0000 (17:37 -0700)
commit21a43e397e7f66d3be44e09b54045f1a67838cc0
tree8650915c69016ff223f9b73866a249d4dd95f451
parent54b333529df25b21da462c7dcc16c7dc779d9f26
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>
init/Kconfig