Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55ca089e authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Ingo Molnar
Browse files

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 1eede070 ("Introduce new
top level suspend and hibernation callbacks") interacting with new
usages ...

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Acked-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 393d81aa

drivers/xen/manage.c

+2 −2
Original line number Diff line number Diff line
@@ -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();