[Xen-changelog] [xen-3.2-testing] pv-on-hvm: Update for linux-2.6.18-xen.hg:623:2866e6af50

["Xen patchbot-3.2-testing" <patchbot-3.2-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1217514946 -3600
# Node ID 39fec85f422123f39c9b4b42b9c73bc593f139e5
# Parent  7bd353ce5591575f59a2052479bd915025a73cc3
pv-on-hvm: Update for linux-2.6.18-xen.hg:623:2866e6af50
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
xen-unstable changeset:   18199:39f2dfacbcadc44a55fcae0678ec0d2f81f4ba61
xen-unstable date:        Thu Jul 31 15:34:58 2008 +0100
---
 unmodified_drivers/linux-2.6/platform-pci/machine_reboot.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff -r 7bd353ce5591 -r 39fec85f4221 
unmodified_drivers/linux-2.6/platform-pci/machine_reboot.c
--- a/unmodified_drivers/linux-2.6/platform-pci/machine_reboot.c        Thu Jul 
31 11:56:17 2008 +0100
+++ b/unmodified_drivers/linux-2.6/platform-pci/machine_reboot.c        Thu Jul 
31 15:35:46 2008 +0100
@@ -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
 
        local_irq_disable();
        suspend_cancelled = bp_suspend();
-       resume_notifier();
+       resume_notifier(suspend_cancelled);
        local_irq_enable();
 
        smp_mb();

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog