* [PATCH] x86 / PM: Replace CONFIG_PM_RUNTIME in io_apic.c
@ 2014-11-29 22:56 Rafael J. Wysocki
2014-12-01 10:04 ` Thomas Gleixner
0 siblings, 1 reply; 3+ messages in thread
From: Rafael J. Wysocki @ 2014-11-29 22:56 UTC (permalink / raw)
To: x86
Cc: H. Peter Anvin, Linux Kernel Mailing List, Linux PM list,
Thomas Gleixner, Ingo Molnar
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
After commit b2b49ccbdd54 (PM: Kconfig: Set PM_RUNTIME if PM_SLEEP is
selected) PM_RUNTIME is always set if PM is set, so #ifdef blocks
depending on CONFIG_PM_RUNTIME may now be changed to depend on
CONFIG_PM.
Replace CONFIG_PM_RUNTIME with CONFIG_PM in x86/kernel/apic/io_apic.c.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
This depends on commit b2b49ccbdd54 (PM: Kconfig: Set PM_RUNTIME if PM_SLEEP
is selected) which currently is only in linux-next (via linux-pm).
---
arch/x86/kernel/apic/io_apic.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: linux-pm/arch/x86/kernel/apic/io_apic.c
===================================================================
--- linux-pm.orig/arch/x86/kernel/apic/io_apic.c
+++ linux-pm/arch/x86/kernel/apic/io_apic.c
@@ -3968,7 +3968,7 @@ bool mp_should_keep_irq(struct device *d
{
if (dev->power.is_prepared)
return true;
-#ifdef CONFIG_PM_RUNTIME
+#ifdef CONFIG_PM
if (dev->power.runtime_status == RPM_SUSPENDING)
return true;
#endif
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] x86 / PM: Replace CONFIG_PM_RUNTIME in io_apic.c
2014-11-29 22:56 [PATCH] x86 / PM: Replace CONFIG_PM_RUNTIME in io_apic.c Rafael J. Wysocki
@ 2014-12-01 10:04 ` Thomas Gleixner
2014-12-01 22:27 ` Rafael J. Wysocki
0 siblings, 1 reply; 3+ messages in thread
From: Thomas Gleixner @ 2014-12-01 10:04 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: x86, H. Peter Anvin, Linux Kernel Mailing List, Linux PM list,
Ingo Molnar
On Sat, 29 Nov 2014, Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
>
> After commit b2b49ccbdd54 (PM: Kconfig: Set PM_RUNTIME if PM_SLEEP is
> selected) PM_RUNTIME is always set if PM is set, so #ifdef blocks
> depending on CONFIG_PM_RUNTIME may now be changed to depend on
> CONFIG_PM.
>
> Replace CONFIG_PM_RUNTIME with CONFIG_PM in x86/kernel/apic/io_apic.c.
>
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> ---
>
> This depends on commit b2b49ccbdd54 (PM: Kconfig: Set PM_RUNTIME if PM_SLEEP
> is selected) which currently is only in linux-next (via linux-pm).
The function below is moving in linux-next to a different place
.... So it has to wait until everything has hit linus tree.
Feel free to send the cleanups directly to Linus after linux-pm and
x86 has been merged.
Thanks,
tglx
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] x86 / PM: Replace CONFIG_PM_RUNTIME in io_apic.c
2014-12-01 10:04 ` Thomas Gleixner
@ 2014-12-01 22:27 ` Rafael J. Wysocki
0 siblings, 0 replies; 3+ messages in thread
From: Rafael J. Wysocki @ 2014-12-01 22:27 UTC (permalink / raw)
To: Thomas Gleixner
Cc: x86, H. Peter Anvin, Linux Kernel Mailing List, Linux PM list,
Ingo Molnar
On Monday, December 01, 2014 11:04:47 AM Thomas Gleixner wrote:
> On Sat, 29 Nov 2014, Rafael J. Wysocki wrote:
> > From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> >
> > After commit b2b49ccbdd54 (PM: Kconfig: Set PM_RUNTIME if PM_SLEEP is
> > selected) PM_RUNTIME is always set if PM is set, so #ifdef blocks
> > depending on CONFIG_PM_RUNTIME may now be changed to depend on
> > CONFIG_PM.
> >
> > Replace CONFIG_PM_RUNTIME with CONFIG_PM in x86/kernel/apic/io_apic.c.
> >
> > Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> > ---
> >
> > This depends on commit b2b49ccbdd54 (PM: Kconfig: Set PM_RUNTIME if PM_SLEEP
> > is selected) which currently is only in linux-next (via linux-pm).
>
> The function below is moving in linux-next to a different place
> .... So it has to wait until everything has hit linus tree.
>
> Feel free to send the cleanups directly to Linus after linux-pm and
> x86 has been merged.
OK, I will. Thanks!
Rafael
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-12-01 22:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-11-29 22:56 [PATCH] x86 / PM: Replace CONFIG_PM_RUNTIME in io_apic.c Rafael J. Wysocki
2014-12-01 10:04 ` Thomas Gleixner
2014-12-01 22:27 ` Rafael J. Wysocki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).