diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2008-07-31 15:34:58 +0100 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2008-07-31 15:34:58 +0100 |
| commit | 12e36600a0037182a1a9708e3d716769aeb95fad (patch) | |
| tree | 610763cd3f872a6fde1d4db14dce68cfe214422d /unmodified_drivers | |
| parent | 43154830c3419b6d29e819ae94d75f88898ad35d (diff) | |
| download | xen-12e36600a0037182a1a9708e3d716769aeb95fad.tar.gz xen-12e36600a0037182a1a9708e3d716769aeb95fad.tar.bz2 xen-12e36600a0037182a1a9708e3d716769aeb95fad.zip | |
pv-on-hvm: Update for linux-2.6.18-xen.hg:623:2866e6af50
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
Diffstat (limited to 'unmodified_drivers')
| -rw-r--r-- | unmodified_drivers/linux-2.6/platform-pci/machine_reboot.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/unmodified_drivers/linux-2.6/platform-pci/machine_reboot.c b/unmodified_drivers/linux-2.6/platform-pci/machine_reboot.c index 5517039bd8..92b64e2589 100644 --- a/unmodified_drivers/linux-2.6/platform-pci/machine_reboot.c +++ b/unmodified_drivers/linux-2.6/platform-pci/machine_reboot.c @@ -71,7 +71,7 @@ static int bp_suspend(void) return suspend_cancelled; } -int __xen_suspend(int fast_suspend, void (*resume_notifier)(void)) +int __xen_suspend(int fast_suspend, void (*resume_notifier)(int)) { int err, suspend_cancelled, nr_cpus; struct ap_suspend_info info; @@ -101,7 +101,7 @@ int __xen_suspend(int fast_suspend, void (*resume_notifier)(void)) local_irq_disable(); suspend_cancelled = bp_suspend(); - resume_notifier(); + resume_notifier(suspend_cancelled); local_irq_enable(); smp_mb(); |