summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Lameter <clameter@sgi.com>2007-05-10 03:15:44 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-10 09:26:53 -0700
commitbcf889f96597137760c6edfdd0ee59fd37cb108c (patch)
treef9b878addc86abb81d9f376e5226dd1574db4aee
parentd4751a2797bc0a37a8e85783d65ffaa9de689e60 (diff)
downloadop-kernel-dev-bcf889f96597137760c6edfdd0ee59fd37cb108c.zip
op-kernel-dev-bcf889f96597137760c6edfdd0ee59fd37cb108c.tar.gz
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>
-rw-r--r--mm/slub.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/mm/slub.c b/mm/slub.c
index b07a1ca..b39c8a6 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -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",
OpenPOWER on IntegriCloud