The patch titled
mm: arch_free_page fix
has been added to the -mm tree. Its filename is
mm-arch_free_page-fix.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: mm: arch_free_page fix
From: Nick Piggin <npiggin@xxxxxxx>
After the PG_reserved check was added, arch_free_page was being called in the
wrong place (it could be called for a page we don't actually want to free).
Fix that.
Signed-off-by: Nick Piggin <npiggin@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
mm/page_alloc.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff -puN mm/page_alloc.c~mm-arch_free_page-fix mm/page_alloc.c
--- a/mm/page_alloc.c~mm-arch_free_page-fix
+++ a/mm/page_alloc.c
@@ -492,7 +492,6 @@ static void __free_pages_ok(struct page
int i;
int reserved = 0;
- arch_free_page(page, order);
if (!PageHighMem(page))
debug_check_no_locks_freed(page_address(page),
PAGE_SIZE<<order);
@@ -502,7 +501,9 @@ static void __free_pages_ok(struct page
if (reserved)
return;
+ arch_free_page(page, order);
kernel_map_pages(page, 1 << order, 0);
+
local_irq_save(flags);
__count_vm_events(PGFREE, 1 << order);
free_one_page(page_zone(page), page, order);
@@ -778,13 +779,12 @@ static void fastcall free_hot_cold_page(
struct per_cpu_pages *pcp;
unsigned long flags;
- arch_free_page(page, 0);
-
if (PageAnon(page))
page->mapping = NULL;
if (free_pages_check(page))
return;
+ arch_free_page(page, 0);
kernel_map_pages(page, 1, 0);
pcp = &zone_pcp(zone, get_cpu())->pcp[cold];
_
Patches currently in -mm which might be from npiggin@xxxxxxx are
mm-arch_free_page-fix.patch
mm-locks_freed-fix.patch
mm-add-arch_alloc_page.patch
mm-fault-vs-invalidate-truncate-race-fix.patch
mm-fault-handler-to-replace-nopage-and-populate.patch
mm-fault-vs-invalidate-truncate-check.patch
radix-tree-rcu-lockless-readside.patch
sched-likely-profiling.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
