diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-27 15:20:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-27 15:20:33 -0700 |
| commit | e8dad69408a9812d6bb42d03e74d2c314534a4fa (patch) | |
| tree | df2e09936ce189d587f4e6cfd2a70abd7238c3f7 | |
| parent | be6b694713740cea4610754171deec2db9cd668b (diff) | |
| parent | 4a5fa3590f09999f6db41bc386bce40848fa9f63 (diff) | |
| download | linux-e8dad69408a9812d6bb42d03e74d2c314534a4fa.tar.gz linux-e8dad69408a9812d6bb42d03e74d2c314534a4fa.tar.bz2 linux-e8dad69408a9812d6bb42d03e74d2c314534a4fa.zip | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6:
[PARISC] slub: fix panic with DISCONTIGMEM
[PARISC] set memory ranges in N_NORMAL_MEMORY when onlined
| -rw-r--r-- | arch/parisc/mm/init.c | 4 | ||||
| -rw-r--r-- | init/Kconfig | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c index b7ed8d7a9b33..b1d126258dee 100644 --- a/arch/parisc/mm/init.c +++ b/arch/parisc/mm/init.c @@ -266,8 +266,10 @@ static void __init setup_bootmem(void) } memset(pfnnid_map, 0xff, sizeof(pfnnid_map)); - for (i = 0; i < npmem_ranges; i++) + for (i = 0; i < npmem_ranges; i++) { + node_set_state(i, N_NORMAL_MEMORY); node_set_online(i); + } #endif /* diff --git a/init/Kconfig b/init/Kconfig index 7a71e0a9992a..d886b1e9278e 100644 --- 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 |