diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-27 18:20:33 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-27 18:20:33 -0400 |
commit | e8dad69408a9812d6bb42d03e74d2c314534a4fa (patch) | |
tree | df2e09936ce189d587f4e6cfd2a70abd7238c3f7 | |
parent | be6b694713740cea4610754171deec2db9cd668b (diff) | |
parent | 4a5fa3590f09999f6db41bc386bce40848fa9f63 (diff) |
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) | |||
266 | } | 266 | } |
267 | memset(pfnnid_map, 0xff, sizeof(pfnnid_map)); | 267 | memset(pfnnid_map, 0xff, sizeof(pfnnid_map)); |
268 | 268 | ||
269 | for (i = 0; i < npmem_ranges; i++) | 269 | for (i = 0; i < npmem_ranges; i++) { |
270 | node_set_state(i, N_NORMAL_MEMORY); | ||
270 | node_set_online(i); | 271 | node_set_online(i); |
272 | } | ||
271 | #endif | 273 | #endif |
272 | 274 | ||
273 | /* | 275 | /* |
diff --git a/init/Kconfig b/init/Kconfig index 7a71e0a9992a..d886b1e9278e 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
@@ -1226,6 +1226,7 @@ config SLAB | |||
1226 | per cpu and per node queues. | 1226 | per cpu and per node queues. |
1227 | 1227 | ||
1228 | config SLUB | 1228 | config SLUB |
1229 | depends on BROKEN || NUMA || !DISCONTIGMEM | ||
1229 | bool "SLUB (Unqueued Allocator)" | 1230 | bool "SLUB (Unqueued Allocator)" |
1230 | help | 1231 | help |
1231 | SLUB is a slab allocator that minimizes cache line usage | 1232 | SLUB is a slab allocator that minimizes cache line usage |