diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-13 07:34:11 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-13 07:34:11 +0200 |
| commit | 025c95a6826ad8acfe871f33c2fa9208beeb38df (patch) | |
| tree | 220fe156ff60db13bd3a1319f5e20d6b723de5f4 /arch/x86/xen/suspend.c | |
| parent | Merge branch 'ks8695/timer' into next/cleanup (diff) | |
| parent | ARM: mmp: remove unused definition in APBC and APMU (diff) | |
| download | linux-025c95a6826ad8acfe871f33c2fa9208beeb38df.tar.xz linux-025c95a6826ad8acfe871f33c2fa9208beeb38df.zip | |
Merge branch 'clk' of git://github.com/hzhuang1/linux into next/cleanup
* 'clk' of git://github.com/hzhuang1/linux:
ARM: mmp: remove unused definition in APBC and APMU
ARM: mmp: move mmp2 clock definition to separated file
arm: mmp: move pxa910 clock definition to separated file
arm: mmp: move pxa168 clock definition to separated file
arm: mmp: make private clock definition exclude from common clock
+ Linux 3.6-rc4
Diffstat (limited to 'arch/x86/xen/suspend.c')
| -rw-r--r-- | arch/x86/xen/suspend.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/xen/suspend.c b/arch/x86/xen/suspend.c index ae8a00c39de4..45329c8c226e 100644 --- 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)) { |