diff options
| author | David Rientjes <rientjes@cs.washington.edu> | 2006-09-26 01:24:57 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-26 02:38:36 +0200 |
| commit | f3ef9ead31ae995251b420ac98398bd7545bf4e1 (patch) | |
| tree | aa5addbe49c1f7864bc2e5023b7edb11aaf3706b /mm | |
| parent | [PATCH] i386 bootioremap / kexec fix (diff) | |
| download | linux-f3ef9ead31ae995251b420ac98398bd7545bf4e1.tar.xz linux-f3ef9ead31ae995251b420ac98398bd7545bf4e1.zip | |
[PATCH] do not free non slab allocated per_cpu_pageset
Stops panic associated with attempting to free a non slab-allocated
per_cpu_pageset.
Signed-off-by: David Rientjes <rientjes@cs.washington.edu>
Acked-by: Christoph Lameter <clameter@sgi.com>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/page_alloc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 3b5358a0561f..8a52ba9fe693 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1845,8 +1845,10 @@ static inline void free_zone_pagesets(int cpu) for_each_zone(zone) { struct per_cpu_pageset *pset = zone_pcp(zone, cpu); + /* Free per_cpu_pageset if it is slab allocated */ + if (pset != &boot_pageset[cpu]) + kfree(pset); zone_pcp(zone, cpu) = NULL; - kfree(pset); } } |