linux-kernel - Re: linux-next: build failure after merge of the pm tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <201109282132.46887.rjw@sisk.pl>
Date:	Wed, 28 Sep 2011 21:32:46 +0200
From:	"Rafael J. Wysocki" <rjw@...k.pl>
To:	Ming Lei <ming.lei@...onical.com>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: linux-next: build failure after merge of the pm tree

On Wednesday, September 28, 2011, Ming Lei wrote:
> Hi,
> 
> 2011/9/28 Rafael J. Wysocki <rjw@...k.pl>:
> > On Wednesday, September 28, 2011, Ming Lei wrote:
> >> Hi Stephen and Rafael,
> >>
> >> Sorry, the attachment patch can fix the build failure, which is
> >> caused by unset CONFIG_RUNTIME_PM.
> >
> > First off, that's CONFIG_PM_RUNTIME.  Second, why do you want to build
> > rpm-traces.c at all if CONFIG_PM_RUNTIME is unset?
> >
> 
> Yes, you are right,  follows the correct fix:
> 
> diff --git a/kernel/trace/Makefile b/kernel/trace/Makefile
> index 56bdab5..f49405f 100644
> --- a/kernel/trace/Makefile
> +++ b/kernel/trace/Makefile
> @@ -53,7 +53,9 @@ endif
>  obj-$(CONFIG_EVENT_TRACING) += trace_events_filter.o
>  obj-$(CONFIG_KPROBE_EVENT) += trace_kprobe.o
>  obj-$(CONFIG_TRACEPOINTS) += power-traces.o
> +ifeq ($(CONFIG_PM_RUNTIME),y)
>  obj-$(CONFIG_TRACEPOINTS) += rpm-traces.o
> +endif
>  ifeq ($(CONFIG_TRACING),y)
>  obj-$(CONFIG_KGDB_KDB) += trace_kdb.o
>  endif

Well, this still is kind of ugly.  I'd prefer my patch sent in this thread.

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