Re: [Resend][PATCH] tracing / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM

[Steven Rostedt]

On Sat, 2014-12-13 at 02:34 +0100, Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
> 
> 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@xxxxxxxxx>
> ---
> 
> 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@xxxxxxxxxxxx

-- 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)


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/