Messages in this thread Patch in this message |  | | Date | Thu, 29 Sep 2011 17:32:43 +0800 | | Subject | Re: linux-next: build failure after merge of the pm tree | | From | Ming Lei <> |
| |
On Thu, Sep 29, 2011 at 5:26 PM, Rafael J. Wysocki <rjw@sisk.pl> wrote: >> But I don't think it is ugly, and this way is taken by BLOCK/PERF_EVENTS/ >> KGDB_KDB in kernel/trace/Makefile. > > You're right about this. > >> Also this one is a simple fix and don't introduce any new config option, >> which is unnecessary. > > OK, I'll use your last patch. Care to resend it with a sign-off?
OK, thanks, see attachment.
thanks, -- Ming Lei From a5a34ac175e0223148b9fe8089c99e27882cf024 Mon Sep 17 00:00:00 2001 From: Ming Lei <ming.lei@canonical.com> Date: Wed, 28 Sep 2011 22:40:06 +0800 Subject: [PATCH] kernel/trace/Makefile: build rpm-traces.c only if CONFIG_PM_RUNTIME
Signed-off-by: Ming Lei <ming.lei@canonical.com> --- kernel/trace/Makefile | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
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 -- 1.7.5.4
|  |