From ef727ac37df2b326b6414ff509659b868d592e54 Mon Sep 17 00:00:00 2001 From: Nick Piggin Date: Wed, 22 Mar 2006 00:08:35 -0800 Subject: [PATCH] --- yaml --- r: 22474 b: refs/heads/master c: 70dc991d66cac40fdb07346dba2b5d862d732c34 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/mm/mem.c | 4 ++-- trunk/arch/um/kernel/physmem.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 825a7825e94a..a8f61fa192df 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 84097518d1ecd2330f9488e4c2d09953a3340e74 +refs/heads/master: 70dc991d66cac40fdb07346dba2b5d862d732c34 diff --git a/trunk/arch/powerpc/mm/mem.c b/trunk/arch/powerpc/mm/mem.c index 550517c2dd42..6ae5c130d0db 100644 --- a/trunk/arch/powerpc/mm/mem.c +++ b/trunk/arch/powerpc/mm/mem.c @@ -108,8 +108,8 @@ EXPORT_SYMBOL(phys_mem_access_prot); void online_page(struct page *page) { ClearPageReserved(page); - set_page_count(page, 0); - free_cold_page(page); + set_page_count(page, 1); + __free_page(page); totalram_pages++; num_physpages++; } diff --git a/trunk/arch/um/kernel/physmem.c b/trunk/arch/um/kernel/physmem.c index 544665e04513..0e65340eee33 100644 --- a/trunk/arch/um/kernel/physmem.c +++ b/trunk/arch/um/kernel/physmem.c @@ -279,7 +279,7 @@ int init_maps(unsigned long physmem, unsigned long iomem, unsigned long highmem) for(i = 0; i < total_pages; i++){ p = &map[i]; - set_page_count(p, 0); + memset(p, 0, sizeof(struct page)); SetPageReserved(p); INIT_LIST_HEAD(&p->lru); }