diff options
| author | Nick Piggin <npiggin@suse.de> | 2009-05-05 19:13:45 +1000 |
|---|---|---|
| committer | Pekka Enberg <penberg@cs.helsinki.fi> | 2009-05-06 10:23:17 +0300 |
| commit | 1f0532eb617d28f65c93593a1491f662f14f7eac (patch) | |
| tree | 6023123bae2ed717b35c1c70be0de692e439bf80 /mm | |
| parent | 1eb5ac6466d4be7b15b38ce3ab709600f1bc891f (diff) | |
| download | linux-stable-1f0532eb617d28f65c93593a1491f662f14f7eac.tar.gz linux-stable-1f0532eb617d28f65c93593a1491f662f14f7eac.tar.bz2 linux-stable-1f0532eb617d28f65c93593a1491f662f14f7eac.zip | |
mm: SLOB fix reclaim_state
SLOB does not correctly account reclaim_state.reclaimed_slab, so it will
break memory reclaim. Account it like SLAB does.
Cc: stable@kernel.org
Cc: linux-mm@kvack.org
Acked-by: Matt Mackall <mpm@selenic.com>
Acked-by: Christoph Lameter <cl@linux-foundation.org>
Signed-off-by: Nick Piggin <npiggin@suse.de>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/slob.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mm/slob.c b/mm/slob.c index a2d4ab32198d..f92e66d558bd 100644 --- a/mm/slob.c +++ b/mm/slob.c @@ -60,6 +60,7 @@ #include <linux/kernel.h> #include <linux/slab.h> #include <linux/mm.h> +#include <linux/swap.h> /* struct reclaim_state */ #include <linux/cache.h> #include <linux/init.h> #include <linux/module.h> @@ -255,6 +256,8 @@ static void *slob_new_pages(gfp_t gfp, int order, int node) static void slob_free_pages(void *b, int order) { + if (current->reclaim_state) + current->reclaim_state->reclaimed_slab += 1 << order; free_pages((unsigned long)b, order); } @@ -407,7 +410,7 @@ static void slob_free(void *block, int size) spin_unlock_irqrestore(&slob_lock, flags); clear_slob_page(sp); free_slob_page(sp); - free_page((unsigned long)b); + slob_free_pages(b, 0); return; } |