From 9a24f8bd8f4bd5a819fa3ce8abbcb81c529bc245 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Thu, 17 Apr 2003 08:28:12 -0700 Subject: [PATCH] Cleanups: remove unused label and fix crappy counting code that didn't work. --- include/asm-i386/mach-default/mach_timer.h | 7 ++++--- mm/memory.c | 1 - 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/asm-i386/mach-default/mach_timer.h b/include/asm-i386/mach-default/mach_timer.h index 895e0779d7ea..4b9703bb0288 100644 --- 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 58b5f79ce614..a64f85fd3c33 100644 --- 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); -- 2.39.5