[Xen-changelog] [xen-unstable] x86, time: fix S3 suspend error

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1235917835 0
# Node ID 9af46734ce70fcc7e89f3af1ace876652ec9478f
# Parent  9cad48ba52b0dd83dfeae014aaac7a16af0585dc
x86, time: fix S3 suspend error

platform_time_calibration() is invoked in S3 when irq is disabled,
which causes ASSERT() error in spin_lock_irq(). spin_lock_irqsave()
saves us.

Signed-off-by: Guanqun Lu <guanqun.lu@xxxxxxxxx>
---
 xen/arch/x86/time.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff -r 9cad48ba52b0 -r 9af46734ce70 xen/arch/x86/time.c
--- a/xen/arch/x86/time.c       Sun Mar 01 14:17:08 2009 +0000
+++ b/xen/arch/x86/time.c       Sun Mar 01 14:30:35 2009 +0000
@@ -607,13 +607,14 @@ static void platform_time_calibration(vo
 {
     u64 count;
     s_time_t stamp;
-
-    spin_lock_irq(&platform_timer_lock);
+    unsigned long flags;
+
+    spin_lock_irqsave(&platform_timer_lock, flags);
     count = plt_stamp64 + ((plt_src.read_counter() - plt_stamp) & plt_mask);
     stamp = __read_platform_stime(count);
     stime_platform_stamp = stamp;
     platform_timer_stamp = count;
-    spin_unlock_irq(&platform_timer_lock);
+    spin_unlock_irqrestore(&platform_timer_lock, flags);
 }
 
 static void resume_platform_timer(void)

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