---

yaml --- r: 22474 b: refs/heads/master c: 70dc991 h: refs/heads/master v: v3
git-mirror · Mar 22, 2006 · ef727ac · ef727ac
1 parent b303234
commit ef727ac
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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);
 	}