---

yaml --- r: 136920 b: refs/heads/master c: fdb17ae h: refs/heads/master v: v3
git-mirror · Feb 20, 2009 · eaf1bca · eaf1bca
1 parent 07ce6c8
commit eaf1bca
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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 = {