patch-2.3.24 linux/arch/ppc/mm/init.c

• Lines: 35
• Date: Tue Oct 26 15:02:14 1999
• Orig file: v2.3.23/linux/arch/ppc/mm/init.c
• Orig date: Fri Oct 22 13:21:45 1999

diff -u --recursive --new-file v2.3.23/linux/arch/ppc/mm/init.c linux/arch/ppc/mm/init.c
@@ -204,9 +204,8 @@
         if (pmd_none(*pmd)) {
 		if (!mem_init_done)
 			pte = (pte_t *) MMU_get_page();
-		else if ((pte = (pte_t *) get_zero_page_fast()) == NULL)
-			if ((pte = (pte_t *) __get_free_page(GFP_KERNEL)))
-				clear_page(pte);
+		else if ((pte = (pte_t *) __get_free_page(GFP_KERNEL)))
+			clear_page(pte);
                 if (pte) {
                         pmd_val(*pmd) = (unsigned long)pte;
                         return pte + offset;
@@ -1156,8 +1155,7 @@
 				    __pa(end_of_DRAM) >> PAGE_SHIFT);
 
 	/* remove the bootmem bitmap from the available memory */
-	remove_mem_piece(&phys_avail, start, start + boot_mapsize, 1);
-
+	remove_mem_piece(&phys_avail, start, boot_mapsize, 1);
 	/* add everything in phys_avail into the bootmem map */
 	for (i = 0; i < phys_avail.n_regions; ++i)
 		free_bootmem(phys_avail.regions[i].address,
@@ -1509,10 +1507,10 @@
 	       ramsize >> 20, Hash_size >> 10, Hash);
 	if ( Hash_size )
 	{
+		if ( ppc_md.progress ) ppc_md.progress("hash:patch", 0x345);
 		Hash_end = (PTE *) ((unsigned long)Hash + Hash_size);
 		__clear_user(Hash, Hash_size);
-		
-		if ( ppc_md.progress ) ppc_md.progress("hash:patch", 0x345);
+
 		/*
 		 * Patch up the instructions in head.S:hash_page
 		 */