diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-12 07:29:02 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-12 07:29:02 +0200 |
| commit | ae94b8075a2ed58d2318ef03827b25bc844f844e (patch) | |
| tree | 7211f558d841cb40e1015d0b7527643ad55cb8e7 /mm | |
| parent | eca91e7838ec92e8c12122849ec7539c4765b689 (diff) | |
| parent | a26929fb489188ff959b1715ee67f0c9f84405b5 (diff) | |
| download | blackbird-op-linux-ae94b8075a2ed58d2318ef03827b25bc844f844e.tar.gz blackbird-op-linux-ae94b8075a2ed58d2318ef03827b25bc844f844e.zip | |
Merge branch 'linus' into x86/core
Conflicts:
arch/x86/mm/ioremap.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/slub.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mm/slub.c b/mm/slub.c index 1a427c0ae83b..315c392253c7 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -1628,9 +1628,11 @@ static __always_inline void *slab_alloc(struct kmem_cache *s, void **object; struct kmem_cache_cpu *c; unsigned long flags; + unsigned int objsize; local_irq_save(flags); c = get_cpu_slab(s, smp_processor_id()); + objsize = c->objsize; if (unlikely(!c->freelist || !node_match(c, node))) object = __slab_alloc(s, gfpflags, node, addr, c); @@ -1643,7 +1645,7 @@ static __always_inline void *slab_alloc(struct kmem_cache *s, local_irq_restore(flags); if (unlikely((gfpflags & __GFP_ZERO) && object)) - memset(object, 0, c->objsize); + memset(object, 0, objsize); return object; } |
