* [PATCH] tracing / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
@ 2014-12-06 2:40 Rafael J. Wysocki
2014-12-13 1:34 ` [Resend][PATCH] " Rafael J. Wysocki
0 siblings, 1 reply; 3+ messages in thread
From: Rafael J. Wysocki @ 2014-12-06 2:40 UTC (permalink / raw)
To: Steven Rostedt; +Cc: Ingo Molnar, Linux Kernel Mailing List, Linux PM list
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 files that are
build conditionally if CONFIG_PM_RUNTIME is set may now be build
if CONFIG_PM is set.
Replace CONFIG_PM_RUNTIME with CONFIG_PM in kernel/trace/Makefile
for this reason.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
Note: This depends on commit b2b49ccbdd54 (PM: Kconfig: Set PM_RUNTIME if
PM_SLEEP is selected) which is only in linux-next at the moment (via the
linux-pm tree).
Please let me know if it is OK to take this one into linux-pm.
---
kernel/trace/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: linux-pm/kernel/trace/Makefile
===================================================================
--- linux-pm.orig/kernel/trace/Makefile
+++ linux-pm/kernel/trace/Makefile
@@ -55,7 +55,7 @@ obj-$(CONFIG_EVENT_TRACING) += trace_eve
obj-$(CONFIG_EVENT_TRACING) += trace_events_trigger.o
obj-$(CONFIG_KPROBE_EVENT) += trace_kprobe.o
obj-$(CONFIG_TRACEPOINTS) += power-traces.o
-ifeq ($(CONFIG_PM_RUNTIME),y)
+ifeq ($(CONFIG_PM),y)
obj-$(CONFIG_TRACEPOINTS) += rpm-traces.o
endif
ifeq ($(CONFIG_TRACING),y)
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Resend][PATCH] tracing / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
2014-12-06 2:40 [PATCH] tracing / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM Rafael J. Wysocki
@ 2014-12-13 1:34 ` Rafael J. Wysocki
2014-12-13 1:18 ` Steven Rostedt
0 siblings, 1 reply; 3+ messages in thread
From: Rafael J. Wysocki @ 2014-12-13 1:34 UTC (permalink / raw)
To: Steven Rostedt; +Cc: Ingo Molnar, Linux Kernel Mailing List, Linux PM list
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 files that are
build conditionally if CONFIG_PM_RUNTIME is set may now be build
if CONFIG_PM is set.
Replace CONFIG_PM_RUNTIME with CONFIG_PM in kernel/trace/Makefile
for this reason.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
Please let me know if there are any objections against this. If not, I'll
take it through the linux-pm tree, as I'm going to remove CONFIG_PM_RUNTIME
entirely shortly.
---
kernel/trace/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: linux-pm/kernel/trace/Makefile
===================================================================
--- linux-pm.orig/kernel/trace/Makefile
+++ linux-pm/kernel/trace/Makefile
@@ -55,7 +55,7 @@ obj-$(CONFIG_EVENT_TRACING) += trace_eve
obj-$(CONFIG_EVENT_TRACING) += trace_events_trigger.o
obj-$(CONFIG_KPROBE_EVENT) += trace_kprobe.o
obj-$(CONFIG_TRACEPOINTS) += power-traces.o
-ifeq ($(CONFIG_PM_RUNTIME),y)
+ifeq ($(CONFIG_PM),y)
obj-$(CONFIG_TRACEPOINTS) += rpm-traces.o
endif
ifeq ($(CONFIG_TRACING),y)
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Resend][PATCH] tracing / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
2014-12-13 1:34 ` [Resend][PATCH] " Rafael J. Wysocki
@ 2014-12-13 1:18 ` Steven Rostedt
0 siblings, 0 replies; 3+ messages in thread
From: Steven Rostedt @ 2014-12-13 1:18 UTC (permalink / raw)
To: Rafael J. Wysocki; +Cc: Ingo Molnar, Linux Kernel Mailing List, Linux PM list
On Sat, 2014-12-13 at 02:34 +0100, 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 files that are
> build conditionally if CONFIG_PM_RUNTIME is set may now be build
> if CONFIG_PM is set.
>
> Replace CONFIG_PM_RUNTIME with CONFIG_PM in kernel/trace/Makefile
> for this reason.
>
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> ---
>
> Please let me know if there are any objections against this. If not, I'll
> take it through the linux-pm tree, as I'm going to remove CONFIG_PM_RUNTIME
> entirely shortly.
Feel free to take it.
Acked-by: Steven Rostedt <rostedt@goodmis.org.
-- Steve
>
> ---
> kernel/trace/Makefile | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> Index: linux-pm/kernel/trace/Makefile
> ===================================================================
> --- linux-pm.orig/kernel/trace/Makefile
> +++ linux-pm/kernel/trace/Makefile
> @@ -55,7 +55,7 @@ obj-$(CONFIG_EVENT_TRACING) += trace_eve
> obj-$(CONFIG_EVENT_TRACING) += trace_events_trigger.o
> obj-$(CONFIG_KPROBE_EVENT) += trace_kprobe.o
> obj-$(CONFIG_TRACEPOINTS) += power-traces.o
> -ifeq ($(CONFIG_PM_RUNTIME),y)
> +ifeq ($(CONFIG_PM),y)
> obj-$(CONFIG_TRACEPOINTS) += rpm-traces.o
> endif
> ifeq ($(CONFIG_TRACING),y)
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-12-13 1:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-12-06 2:40 [PATCH] tracing / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM Rafael J. Wysocki
2014-12-13 1:34 ` [Resend][PATCH] " Rafael J. Wysocki
2014-12-13 1:18 ` Steven Rostedt
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).