[PARISC] slub: fix panic with DISCONTIGMEM

Slub makes assumptions about page_to_nid() which are violated by
DISCONTIGMEM and !NUMA.  This violation results in a panic because
page_to_nid() can be non-zero for pages in the discontiguous ranges and
this leads to a null return by get_node().  The assertion by the
maintainer is that DISCONTIGMEM should only be allowed when NUMA is also
defined.  However, at least six architectures: alpha, ia64, m32r, m68k,
mips, parisc violate this.  The panic is a regression against slab, so
just mark slub broken in the problem configuration to prevent users
reporting these panics.

Cc: [email protected]
Acked-by: David Rientjes <[email protected]>
Acked-by: Pekka Enberg <[email protected]>
Signed-off-by: James Bottomley <[email protected]>

diff --git a/init/Kconfig b/init/Kconfig
index 56240e724d9a31dc4ef43647afcf354b8a70f108..a7ad8fbdb564f4cc2b2b531200d1678e812b5322 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1226,6 +1226,7 @@ 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