From mboxrd@z Thu Jan  1 00:00:00 1970
From: Olaf Hering <olaf@aepfle.de>
Subject: [PATCH 26 of 45] gcc-4.6 compile fix:
	xen/arch/x86/time.c
Date: Thu, 19 May 2011 21:05:45 +0200
Message-ID: <c8f5b4743f9a91dc1e87.1305831945@probook.site>
References: <patchbomb.1305831919@probook.site>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xensource.com>
In-Reply-To: <patchbomb.1305831919@probook.site>
List-Unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: xen-devel@lists.xensource.com
List-Id: xen-devel@lists.xenproject.org

# HG changeset patch
# User Olaf Hering <olaf@aepfle.de>
# Date 1305824411 -7200
# Node ID c8f5b4743f9a91dc1e879d35f8f2d4b981f0963d
# Parent  a7329b4e30a3c5db1ec52c9d331f13187927d3bb
gcc-4.6 compile fix: xen/arch/x86/time.c

time.c: In function 'local_time_calibration':
time.c:1007:14: error: variable 'prev_local_stime' set but not used [-Werror=unused-but-set-variable]

Signed-off-by: Olaf Hering <olaf@aepfle.de>

diff -r a7329b4e30a3 -r c8f5b4743f9a xen/arch/x86/time.c
--- a/xen/arch/x86/time.c	Thu May 19 19:00:10 2011 +0200
+++ b/xen/arch/x86/time.c	Thu May 19 19:00:11 2011 +0200
@@ -1052,14 +1052,15 @@ static void local_time_calibration(void)
     curr_master_stime = c->stime_master_stamp;
     local_irq_enable();
 
-#if 0
+    if ( 0 )
+    {
     printk("PRE%d: tsc=%"PRIu64" stime=%"PRIu64" master=%"PRIu64"\n",
            smp_processor_id(), prev_tsc, prev_local_stime, prev_master_stime);
     printk("CUR%d: tsc=%"PRIu64" stime=%"PRIu64" master=%"PRIu64
            " -> %"PRId64"\n",
            smp_processor_id(), curr_tsc, curr_local_stime, curr_master_stime,
            curr_master_stime - curr_local_stime);
-#endif
+    }
 
     /* Local time warps forward if it lags behind master time. */
     if ( curr_local_stime < curr_master_stime )