[Xen-changelog] [xen-unstable] x86 tsc: Fix check_tsc_warp() bug and add copyright notice

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1254988311 -3600
# Node ID cac46b87a69518a7793b142297dc7e4db3d9d798
# Parent  a2ace77e943135e873b9ea46a83599be81f8d315
x86 tsc: Fix check_tsc_warp() bug and add copyright notice

Signed-off-by: Dan Magenheimer <dan.magenheimer@xxxxxxxxxx>
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 xen/arch/x86/time.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)

diff -r a2ace77e9431 -r cac46b87a695 xen/arch/x86/time.c
--- a/xen/arch/x86/time.c       Thu Oct 08 08:48:52 2009 +0100
+++ b/xen/arch/x86/time.c       Thu Oct 08 08:51:51 2009 +0100
@@ -1442,6 +1442,10 @@ struct tm wallclock_time(void)
  * TSC Reliability check
  */
 
+/*
+ * The Linux original version of this function is
+ * Copyright (c) 2006, Red Hat, Inc., Ingo Molnar
+ */
 void check_tsc_warp(unsigned long tsc_khz, unsigned long *max_warp)
 {
 #define rdtsc_barrier() mb()
@@ -1494,7 +1498,7 @@ void check_tsc_warp(unsigned long tsc_kh
         if ( unlikely(prev > now) )
         {
             spin_lock(&sync_lock);
-            if ( *max_warp > prev - now )
+            if ( *max_warp < prev - now )
                 *max_warp = prev - now;
             spin_unlock(&sync_lock);
         }

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog