git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
xen: add xen_arch_resume()/xen_timer_resume hook for ia64 support
[safe/jmp/linux-2.6]
/
drivers
/
xen
/
manage.c
diff --git
a/drivers/xen/manage.c
b/drivers/xen/manage.c
index
5b546e3
..
2bb268e
100644
(file)
--- a/
drivers/xen/manage.c
+++ b/
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();