From 55ca089e2579de90f048aca2a3030b8b2f864813 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Thu, 17 Jul 2008 13:09:24 +1000 Subject: [PATCH] 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 Cc: Jeremy Fitzhardinge Acked-by: Rafael J. Wysocki Cc: Jesse Barnes Signed-off-by: Ingo Molnar --- drivers/xen/manage.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c index 2bb268e4ac5..a5bc91ae6ff 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(); -- 2.41.0