Re: linux-next: pci tree build failure

Ingo Molnar
2008-07-18T07:53:48Z

* Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Rafael,
>
> On Fri, 18 Jul 2008 00:57:06 +0200 "Rafael J. Wysocki" <rjw@sisk.pl> wrote:
> >
> > The patch is correct.
>
> Thanks.

heh, i've done the exactly same change yesterday night, independently,
in tip/xen-64bit - where this interaction originates from. (see below)

but i zapped it and took yours instead because yours came 19 hours
earlier - i should have checked my mbox sooner ;)

Jeremy, is this change fine with you too?

( btw., could you please Cc: lkml to all patches? It's not like
linux-next is irrelevant to lkml - it's highly on topic in fact - and
what seems like future stuff today is an actuality tomorrow that
people might want to grep for. )

Ingo

---------------------------->
commit dc860d89be3e640b98e9e202611466cc22575166
Author: Ingo Molnar <mingo@elte.hu>
Date: Thu Jul 17 23:58:52 2008 +0200

x86, xen: adopt suspend/resume API use

the device_power_up()/device_resume() APIs got changed by:
1eede070a5 "Introduce new top level suspend and hibernation callbacks".

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
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();