From 12e36600a0037182a1a9708e3d716769aeb95fad Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Thu, 31 Jul 2008 15:34:58 +0100 Subject: pv-on-hvm: Update for linux-2.6.18-xen.hg:623:2866e6af50 Signed-off-by: Keir Fraser --- unmodified_drivers/linux-2.6/platform-pci/machine_reboot.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'unmodified_drivers') 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(); -- cgit v1.2.3