Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bcf889f9 authored by Christoph Lameter's avatar Christoph Lameter Committed by Linus Torvalds
Browse files

SLUB: remove nr_cpu_ids hack 



This was in SLUB in order to head off trouble while the nr_cpu_ids
functionality was not merged.  Its merged now so no need to still have this.

Signed-off-by: default avatarChristoph Lameter <clameter@sgi.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d4751a27

mm/slub.c

+2 −3
Original line number Diff line number Diff line
@@ -2445,9 +2445,8 @@ void __init kmem_cache_init(void) 
	register_cpu_notifier(&slab_notifier);

#endif



	if (nr_cpu_ids)	/* Remove when nr_cpu_ids is fixed upstream ! */

		kmem_size = offsetof(struct kmem_cache, cpu_slab)

			 + nr_cpu_ids * sizeof(struct page *);

	kmem_size = offsetof(struct kmem_cache, cpu_slab) +

				nr_cpu_ids * sizeof(struct page *);



	printk(KERN_INFO "SLUB: Genslabs=%d, HWalign=%d, Order=%d-%d, MinObjects=%d,"

		" Processors=%d, Nodes=%d\n",