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 1eede070a5
("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>
This commit is contained in:
parent
393d81aa02
commit
55ca089e25
|
@ -63,7 +63,7 @@ static int xen_suspend(void *data)
|
||||||
gnttab_resume();
|
gnttab_resume();
|
||||||
xen_mm_unpin_all();
|
xen_mm_unpin_all();
|
||||||
|
|
||||||
device_power_up();
|
device_power_up(PMSG_RESUME);
|
||||||
|
|
||||||
if (!*cancelled) {
|
if (!*cancelled) {
|
||||||
xen_irq_resume();
|
xen_irq_resume();
|
||||||
|
@ -114,7 +114,7 @@ static void do_suspend(void)
|
||||||
} else
|
} else
|
||||||
xenbus_suspend_cancel();
|
xenbus_suspend_cancel();
|
||||||
|
|
||||||
device_resume();
|
device_resume(PMSG_RESUME);
|
||||||
|
|
||||||
/* Make sure timer events get retriggered on all CPUs */
|
/* Make sure timer events get retriggered on all CPUs */
|
||||||
clock_was_set();
|
clock_was_set();
|
||||||
|
|
Loading…
Reference in New Issue