[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <alpine.DEB.2.00.1105101656310.15037@chino.kir.corp.google.com>
Date: Tue, 10 May 2011 17:08:54 -0700 (PDT)
From: David Rientjes <rientjes@...gle.com>
To: James Bottomley <James.Bottomley@...e.de>,
Pekka Enberg <penberg@...helsinki.fi>,
Greg Kroah-Hartman <gregkh@...e.de>,
Linus Torvalds <torvalds@...ux-foundation.org>
cc: Geert Uytterhoeven <geert@...ux-m68k.org>,
Andrew Morton <akpm@...ux-foundation.org>,
Christoph Lameter <cl@...ux.com>, stable@...nel.org,
linux-m68k@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: [patch] slub: Revert "[PARISC] slub: fix panic with DISCONTIGMEM"
On Mon, 9 May 2011, James Bottomley wrote:
> > Great, and if that works out successfully this time around I think we'll
> > either need to fix each individual arch Kconfig that we know doesn't work
> > well (at least parisc because of the scheduling issue) so that it at least
> > enables CONFIG_NUMA implicitly for discontigmem unless CONFIG_BROKEN is
> > set.
>
> OK, I confirm that the N_NORMAL_MEMORY patch on its own fixes slub for
> us. We can revert the mark slub BROKEN in DISCONTIGMEM && !NUMA patch.
>
Ok, so we need to revert 4a5fa3590f09 ([PARISC] slub: fix panic with
DISCONTIGMEM) that did not allow CONFIG_SLUB to be set for architectures
that use DISCONTIGMEM without NUMA support unless they have CONFIG_BROKEN
set from Linus' tree _and_ from the stable trees.
slub: Revert "[PARISC] slub: fix panic with DISCONTIGMEM"
4a5fa3590f09 ([PARISC] slub: fix panic with DISCONTIGMEM) 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.
This reverts the former commit so that SLUB may now be used on such
architectures since there haven't been any reports of additional errors.
Cc: James Bottomley <James.Bottomley@...e.de>
Signed-off-by: David Rientjes <rientjes@...gle.com>
---
init/Kconfig | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/init/Kconfig b/init/Kconfig
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists