]> err.no Git - linux-2.6/commitdiff
linux-next: pci tree build failure
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 17 Jul 2008 03:09:24 +0000 (13:09 +1000)
committerIngo Molnar <mingo@elte.hu>
Fri, 18 Jul 2008 07:51:02 +0000 (09:51 +0200)
Today's linux-next build (x86_64 allmodconfig) failed like this:

 drivers/xen/manage.c: In function 'xen_suspend':
 drivers/xen/manage.c:66: error: too few arguments to function 'device_power_up'
 drivers/xen/manage.c: In function 'do_suspend':
 drivers/xen/manage.c:117: error: too few arguments to function 'device_resume'

Caused by commit 1eede070a59e1cc73da51e1aaa00d9ab86572cfc ("Introduce new
top level suspend and hibernation callbacks") interacting with new
usages ...

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Acked-by: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
drivers/xen/manage.c

index 2bb268e4ac56a242033a69e1dec42a4f4c646b0f..a5bc91ae6ff69f5d5d4b2e9f49e308acd9126b20 100644 (file)
@@ -63,7 +63,7 @@ static int xen_suspend(void *data)
        gnttab_resume();
        xen_mm_unpin_all();
 
-       device_power_up();
+       device_power_up(PMSG_RESUME);
 
        if (!*cancelled) {
                xen_irq_resume();
@@ -114,7 +114,7 @@ static void do_suspend(void)
        } else
                xenbus_suspend_cancel();
 
-       device_resume();
+       device_resume(PMSG_RESUME);
 
        /* Make sure timer events get retriggered on all CPUs */
        clock_was_set();