diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2006-04-29 02:42:26 +0200 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-04-29 02:42:26 +0200 |
| commit | d6754b401a15eaa16492ea5dbaa4826361d3f411 (patch) | |
| tree | 032f067d3af458527d903a7653885404ed82431e /mm/slab.c | |
| parent | linux/blkpg.h needs <linux/compiler.h> for __user (diff) | |
| parent | [PATCH] slab: fix crash on __drain_alien_cahce() during CPU Hotplug (diff) | |
| download | linux-d6754b401a15eaa16492ea5dbaa4826361d3f411.tar.xz linux-d6754b401a15eaa16492ea5dbaa4826361d3f411.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'mm/slab.c')
| -rw-r--r-- | mm/slab.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mm/slab.c b/mm/slab.c index e6ef9bd52335..c32af7e7581e 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -979,7 +979,8 @@ static void __drain_alien_cache(struct kmem_cache *cachep, * That way we could avoid the overhead of putting the objects * into the free lists and getting them back later. */ - transfer_objects(rl3->shared, ac, ac->limit); + if (rl3->shared) + transfer_objects(rl3->shared, ac, ac->limit); free_block(cachep, ac->entry, ac->avail, node); ac->avail = 0; @@ -1036,7 +1037,7 @@ static inline void free_alien_cache(struct array_cache **ac_ptr) #endif -static int __devinit cpuup_callback(struct notifier_block *nfb, +static int cpuup_callback(struct notifier_block *nfb, unsigned long action, void *hcpu) { long cpu = (long)hcpu; |