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: Christoph Lameter <clameter@sgi.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
d4751a2797
commit
bcf889f965
@ -2445,9 +2445,8 @@ void __init kmem_cache_init(void)
|
|||||||
register_cpu_notifier(&slab_notifier);
|
register_cpu_notifier(&slab_notifier);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (nr_cpu_ids) /* Remove when nr_cpu_ids is fixed upstream ! */
|
kmem_size = offsetof(struct kmem_cache, cpu_slab) +
|
||||||
kmem_size = offsetof(struct kmem_cache, cpu_slab)
|
nr_cpu_ids * sizeof(struct page *);
|
||||||
+ nr_cpu_ids * sizeof(struct page *);
|
|
||||||
|
|
||||||
printk(KERN_INFO "SLUB: Genslabs=%d, HWalign=%d, Order=%d-%d, MinObjects=%d,"
|
printk(KERN_INFO "SLUB: Genslabs=%d, HWalign=%d, Order=%d-%d, MinObjects=%d,"
|
||||||
" Processors=%d, Nodes=%d\n",
|
" Processors=%d, Nodes=%d\n",
|
||||||
|
Loading…
Reference in New Issue
Block a user