diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-15 10:59:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-15 10:59:09 -0700 |
| commit | 76ca07832842100b14a31ad8996dab7b0c28aa42 (patch) | |
| tree | 496df81083fda9be38f8ff88cdc3ef59c2d72a8d /arch/ia64 | |
| parent | 27d2a8b97ebc4467e47722415b81ebe72d5f654f (diff) | |
| parent | b056b6a0144de90707cd22cf7b4f60bf69c86d59 (diff) | |
| download | linux-3.10-76ca07832842100b14a31ad8996dab7b0c28aa42.tar.gz linux-3.10-76ca07832842100b14a31ad8996dab7b0c28aa42.tar.bz2 linux-3.10-76ca07832842100b14a31ad8996dab7b0c28aa42.zip | |
Merge branch 'for-linus' of git://xenbits.xen.org/people/sstabellini/linux-pvhvm
* 'for-linus' of git://xenbits.xen.org/people/sstabellini/linux-pvhvm:
xen: suspend: remove xen_hvm_suspend
xen: suspend: pull pre/post suspend hooks out into suspend_info
xen: suspend: move arch specific pre/post suspend hooks into generic hooks
xen: suspend: refactor non-arch specific pre/post suspend hooks
xen: suspend: add "arch" to pre/post suspend hooks
xen: suspend: pass extra hypercall argument via suspend_info struct
xen: suspend: refactor cancellation flag into a structure
xen: suspend: use HYPERVISOR_suspend for PVHVM case instead of open coding
xen: switch to new schedop hypercall by default.
xen: use new schedop interface for suspend
xen: do not respond to unknown xenstore control requests
xen: fix compile issue if XEN is enabled but XEN_PVHVM is disabled
xen: PV on HVM: support PV spinlocks and IPIs
xen: make the ballon driver work for hvm domains
xen-blkfront: handle Xen major numbers other than XENVBD
xen: do not use xen_info on HVM, set pv_info name to "Xen HVM"
xen: no need to delay xen_setup_shutdown_event for hvm guests anymore
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/xen/suspend.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/ia64/xen/suspend.c b/arch/ia64/xen/suspend.c index fd66b048c6f..419c8620945 100644 --- a/arch/ia64/xen/suspend.c +++ b/arch/ia64/xen/suspend.c @@ -37,19 +37,14 @@ xen_mm_unpin_all(void) /* nothing */ } -void xen_pre_device_suspend(void) -{ - /* nothing */ -} - void -xen_pre_suspend() +xen_arch_pre_suspend() { /* nothing */ } void -xen_post_suspend(int suspend_cancelled) +xen_arch_post_suspend(int suspend_cancelled) { if (suspend_cancelled) return; |