From eaf1bcae35132202ebe1230ce563cf9cc0b416cc Mon Sep 17 00:00:00 2001
From: Alok Kataria <akataria@vmware.com>
Date: Fri, 20 Feb 2009 10:23:18 -0800
Subject: [PATCH] --- yaml --- r: 136920 b: refs/heads/master c:
 fdb17aeb28aaad3eae5ef57e70cb287d34d1049d h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/arch/x86/kernel/vmiclock_32.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 43b2a843b3b0..614496a06f42 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 609162850db11dfe3b23f43b36888aa8b3ad7685
+refs/heads/master: fdb17aeb28aaad3eae5ef57e70cb287d34d1049d
diff --git a/trunk/arch/x86/kernel/vmiclock_32.c b/trunk/arch/x86/kernel/vmiclock_32.c
index 9cd28c04952a..b77ad5789af9 100644
--- a/trunk/arch/x86/kernel/vmiclock_32.c
+++ b/trunk/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 = {