Commit e8dad694 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents be6b6947 4a5fa359

arch/parisc/mm/init.c

+3 −1
Original line number Diff line number Diff line
@@ -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



	/*

init/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -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