Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6

Browse source 
* '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
This commit is contained in:
Linus Torvalds 2011-04-27 15:20:33 -07:00
commit e8dad69408
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/parisc/mm/init.c
View file

@ -266,8 +266,10 @@ static void __init setup_bootmem(void)
} }
memset(pfnnid_map, 0xff, sizeof(pfnnid_map)); 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); node_set_online(i);
}
#endif #endif
/* /*

1
init/Kconfig
View file

@ -1226,6 +1226,7 @@ config SLAB
per cpu and per node queues. per cpu and per node queues.
config SLUB config SLUB
depends on BROKEN || NUMA || !DISCONTIGMEM
bool "SLUB (Unqueued Allocator)" bool "SLUB (Unqueued Allocator)"
help help
SLUB is a slab allocator that minimizes cache line usage SLUB is a slab allocator that minimizes cache line usage