tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds e8dad694 be6b6947

+4 -1
unified split
+3 -1
arch/parisc/mm/init.c
··· 266 } 267 memset(pfnnid_map, 0xff, sizeof(pfnnid_map)); 268 269 - for (i = 0; i < npmem_ranges; i++) 270 node_set_online(i); 271 #endif 272 273 /*
··· 266 } 267 memset(pfnnid_map, 0xff, sizeof(pfnnid_map)); 268 269 + for (i = 0; i < npmem_ranges; i++) { 270 + node_set_state(i, N_NORMAL_MEMORY); 271 node_set_online(i); 272 + } 273 #endif 274 275 /*
+1
init/Kconfig
··· 1226 per cpu and per node queues. 1227 1228 config SLUB 1229 bool "SLUB (Unqueued Allocator)" 1230 help 1231 SLUB is a slab allocator that minimizes cache line usage
··· 1226 per cpu and per node queues. 1227 1228 config SLUB 1229 + depends on BROKEN || NUMA || !DISCONTIGMEM 1230 bool "SLUB (Unqueued Allocator)" 1231 help 1232 SLUB is a slab allocator that minimizes cache line usage