Cleanups: remove unused label and fix crappy counting code that

didn't work.

include/asm-i386/mach-default/mach_timer.h

@@ -36,12 +36,13 @@ static inline void mach_prepare_counter(void)
 	outb_p(CALIBRATE_LATCH >> 8, 0x42);       /* MSB of count */
 }
 
-static inline void mach_countup(unsigned long *count)
+static inline void mach_countup(unsigned long *count_p)
 {
-	*count = 0L;
+	unsigned long count = 0;
 	do {
-		*count++;
+		count++;
 	} while ((inb_p(0x61) & 0x20) == 0);
+	*count_p = count;
 }
 
 #endif /* !_MACH_TIMER_H */

mm/memory.c

@@ -317,7 +317,6 @@ skip_copy_pmd_range:	address = (address + PGDIR_SIZE) & PGDIR_MASK;
 				get_page(page);
 				dst->rss++;
 
-cont_copy_pte_range:
 				set_pte(dst_pte, pte);
 				pte_chain = page_add_rmap(page, dst_pte,
 							pte_chain);