From a799869286eed099ced2d4bcd0aa296ad127c47c Mon Sep 17 00:00:00 2001
From: Isaku Yamahata <yamahata@valinux.co.jp>
Date: Tue, 8 Jul 2008 15:06:32 -0700
Subject: [PATCH] --- yaml --- r: 104404 b: refs/heads/master c:
 ad55db9fed6d6cd09333045945cb03ba2c070085 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/arch/x86/xen/suspend.c | 5 ++++-
 trunk/arch/x86/xen/xen-ops.h | 1 -
 trunk/drivers/xen/manage.c   | 6 ++++--
 trunk/include/xen/xen-ops.h  | 3 +++
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index b102b1c4971a..bff2eb92abfc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ffb40b8ecdf314edd88dc5550d6bcbebf29970b
+refs/heads/master: ad55db9fed6d6cd09333045945cb03ba2c070085
diff --git a/trunk/arch/x86/xen/suspend.c b/trunk/arch/x86/xen/suspend.c
index 251669a932d4..2a234db5949b 100644
--- a/trunk/arch/x86/xen/suspend.c
+++ b/trunk/arch/x86/xen/suspend.c
@@ -38,8 +38,11 @@ void xen_post_suspend(int suspend_cancelled)
 		xen_cpu_initialized_map = cpu_online_map;
 #endif
 		xen_vcpu_restore();
-		xen_timer_resume();
 	}
 
 }
 
+void xen_arch_resume(void)
+{
+	/* nothing */
+}
diff --git a/trunk/arch/x86/xen/xen-ops.h b/trunk/arch/x86/xen/xen-ops.h
index 6f4b1045c1c2..77354d204257 100644
--- a/trunk/arch/x86/xen/xen-ops.h
+++ b/trunk/arch/x86/xen/xen-ops.h
@@ -37,7 +37,6 @@ void __init xen_time_init(void);
 unsigned long xen_get_wallclock(void);
 int xen_set_wallclock(unsigned long time);
 unsigned long long xen_sched_clock(void);
-void xen_timer_resume(void);
 
 irqreturn_t xen_debug_interrupt(int irq, void *dev_id);
 
diff --git a/trunk/drivers/xen/manage.c b/trunk/drivers/xen/manage.c
index 5b546e365f00..2bb268e4ac56 100644
--- a/trunk/drivers/xen/manage.c
+++ b/trunk/drivers/xen/manage.c
@@ -68,6 +68,7 @@ static int xen_suspend(void *data)
 	if (!*cancelled) {
 		xen_irq_resume();
 		xen_console_resume();
+		xen_timer_resume();
 	}
 
 	return 0;
@@ -107,9 +108,10 @@ static void do_suspend(void)
 		goto out;
 	}
 
-	if (!cancelled)
+	if (!cancelled) {
+		xen_arch_resume();
 		xenbus_resume();
-	else
+	} else
 		xenbus_suspend_cancel();
 
 	device_resume();
diff --git a/trunk/include/xen/xen-ops.h b/trunk/include/xen/xen-ops.h
index a706d6a78960..883a21bba24b 100644
--- a/trunk/include/xen/xen-ops.h
+++ b/trunk/include/xen/xen-ops.h
@@ -11,4 +11,7 @@ void xen_post_suspend(int suspend_cancelled);
 void xen_mm_pin_all(void);
 void xen_mm_unpin_all(void);
 
+void xen_timer_resume(void);
+void xen_arch_resume(void);
+
 #endif /* INCLUDE_XEN_OPS_H */