[Xen-devel] [PATCH 3 of 3] fix S3 resume error

[Guanqun Lu <guanqun.lu@xxxxxxxxx>]

# HG changeset patch
# User Guanqun Lu <guanqun.lu@xxxxxxxxx>
# Date 1235401627 -28800
# Node ID 04e7e4e8519fbbd2ec141875d466ea8ca038d553
# Parent  0e17f070db2aa92bc74f29245cdb8528aa72bbe3
fix S3 resume error

spin_lock() usage in do_settime() in this situation is invoked
when irq is disabled, which causes check_lock() BUG_ON().
We bypass the check by using spin_debug_disable().  It's safe
since no other CPUs are online yet at this moment.

Signed-off-by: Guanqun Lu <guanqun.lu@xxxxxxxxx>

diff -r 0e17f070db2a -r 04e7e4e8519f xen/arch/x86/time.c
--- a/xen/arch/x86/time.c       Mon Feb 23 23:07:01 2009 +0800
+++ b/xen/arch/x86/time.c       Mon Feb 23 23:07:07 2009 +0800
@@ -1300,7 +1300,9 @@ int time_resume(void)
 
     init_percpu_time();
 
+    spin_debug_disable();
     do_settime(get_cmos_time() + cmos_utc_offset, 0, NOW());
+    spin_debug_enable();
 
     update_vcpu_system_time(current);
 

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