pv-on-hvm: Update for linux-2.6.18-xen.hg:623:2866e6af50

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

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 5517039bd8b5ff71e6ecce612c6966e2ffd24be8..92b64e25895933690a9d546cb76b9a43abf966b4 100644 (file)
--- 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();