Cleanups: remove unused label and fix crappy counting code that

didn't work.

diff --git a/include/asm-i386/mach-default/mach_timer.h b/include/asm-i386/mach-default/mach_timer.h
index 895e0779d7eac68e2ade90dca5c67063a9658844..4b9703bb0288f4783ce846bfb4f9ce446dd0399a 100644 (file)
--- a/include/asm-i386/mach-default/mach_timer.h
+++ b/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 */

diff --git a/mm/memory.c b/mm/memory.c
index 58b5f79ce6147981679c9154c5eb5e399dacfcd6..a64f85fd3c337af25868dc534c4d237f5aee2a2c 100644 (file)
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -317,7 +317,6 @@ skip_copy_pte_range:
                                get_page(page);
                                dst->rss++;
 
-cont_copy_pte_range:
                                set_pte(dst_pte, pte);
                                pte_chain = page_add_rmap(page, dst_pte,
                                                        pte_chain);