From: Alok Kataria <akataria@vmware.com>
Date: Fri, 20 Feb 2009 18:23:18 +0000 (-0800)
Subject: x86, vmi: TSC going backwards check in vmi clocksource, cleanup
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=fdb17aeb28aaad3eae5ef57e70cb287d34d1049d;p=deliverable%2Flinux.git

x86, vmi: TSC going backwards check in vmi clocksource, cleanup

clean up vmi_read_cycles to use max()

Reported-b: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Alok N Kataria <akataria@vmware.com>
Cc: Zach Amsden <zach@vmware.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/arch/x86/kernel/vmiclock_32.c b/arch/x86/kernel/vmiclock_32.c
index 9cd28c04952a..b77ad5789af9 100644
--- a/arch/x86/kernel/vmiclock_32.c
+++ b/arch/x86/kernel/vmiclock_32.c
@@ -288,8 +288,7 @@ static struct clocksource clocksource_vmi;
 static cycle_t read_real_cycles(void)
 {
 	cycle_t ret = (cycle_t)vmi_timer_ops.get_cycle_counter(VMI_CYCLES_REAL);
-	return ret >= clocksource_vmi.cycle_last ?
-		ret : clocksource_vmi.cycle_last;
+	return max(ret, clocksource_vmi.cycle_last);
 }
 
 static struct clocksource clocksource_vmi = {