Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=bcf889f96597137760c6edfdd0ee59fd37cb108c
Commit:     bcf889f96597137760c6edfdd0ee59fd37cb108c
Parent:     d4751a2797bc0a37a8e85783d65ffaa9de689e60
Author:     Christoph Lameter <[EMAIL PROTECTED]>
AuthorDate: Thu May 10 03:15:44 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Thu May 10 09:26:53 2007 -0700

    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 <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 mm/slub.c |    5 ++---
 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",
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to