git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit '4cb38750d49010ae72e718d46605ac9ba5a851b4' into stable/for-linus-3.6
[pandora-kernel.git]
/
arch
/
x86
/
xen
/
suspend.c
diff --git
a/arch/x86/xen/suspend.c
b/arch/x86/xen/suspend.c
index
ae8a00c
..
45329c8
100644
(file)
--- a/
arch/x86/xen/suspend.c
+++ b/
arch/x86/xen/suspend.c
@@
-30,7
+30,7
@@
void xen_arch_hvm_post_suspend(int suspend_cancelled)
{
#ifdef CONFIG_XEN_PVHVM
int cpu;
- xen_hvm_
resume
_shared_info();
+ xen_hvm_
init
_shared_info();
xen_callback_vector();
xen_unplug_emulated_devices();
if (xen_feature(XENFEAT_hvm_safe_pvclock)) {