Re: linux-next: pci tree build failure

Rafael J. Wysocki
2008-07-17T22:55:13Z

On Thursday, 17 of July 2008, Stephen Rothwell wrote:
> Hi Jesse,
>
> 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 ...
>
> I applied the patch below (which could be incorrect).

The patch is correct.

Thanks,
Rafael

> The above commit is now in Linus' tree, so this needs to be fixed in the
> merge of the x86(?) tree.
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
>
> From aa015dc0cceb8478a89421c4015e81f78a9cf106 Mon Sep 17 00:00:00 2001
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 17 Jul 2008 13:01:15 +1000
> Subject: [PATCH] pci: fix xen fallout from PM API change
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> 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 2bb268e..a5bc91a 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();