diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-07-17 07:09:24 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 11:51:02 +0400 |
| commit | 55ca089e2579de90f048aca2a3030b8b2f864813 (patch) | |
| tree | 50803a73a40810c9728ab54b47881f078ef3d9e4 | |
| parent | 393d81aa026e19b6ede6f5f11955c97ee62e5df5 (diff) | |
| download | linux-55ca089e2579de90f048aca2a3030b8b2f864813.tar.xz | |
linux-next: pci tree build failure
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>
| -rw-r--r-- | drivers/xen/manage.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c index 2bb268e4ac56..a5bc91ae6ff6 100644 --- a/drivers/xen/manage.c +++ b/drivers/xen/manage.c @@ -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(); |