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

Ming Lei
2011-09-28T05:11:26Z

[-- Attachment #1: Type: text/plain, Size: 2427 bytes --]

Hi Stephen and Rafael,

Sorry, the attachment patch can fix the build failure, which is
caused by unset CONFIG_RUNTIME_PM.

thanks,
--
Ming Lei

On Wed, Sep 28, 2011 at 12:51 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Rafael,
>
> After merging the pm tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> In file included from include/trace/ftrace.h:567:0,
>                 from include/trace/define_trace.h:96,
>                 from include/trace/events/rpm.h:99,
>                 from kernel/trace/rpm-traces.c:15:
> include/trace/events/rpm.h: In function 'ftrace_raw_event_rpm_internal':
> include/trace/events/rpm.h:16:1: error: 'struct dev_pm_info' has no member named 'usage_count'
> include/trace/events/rpm.h:16:1: error: 'struct dev_pm_info' has no member named 'disable_depth'
> include/trace/events/rpm.h:16:1: error: 'struct dev_pm_info' has no member named 'runtime_auto'
> include/trace/events/rpm.h:16:1: error: 'struct dev_pm_info' has no member named 'request_pending'
> include/trace/events/rpm.h:16:1: error: 'struct dev_pm_info' has no member named 'irq_safe'
> include/trace/events/rpm.h:16:1: error: 'struct dev_pm_info' has no member named 'child_count'
> In file included from include/trace/ftrace.h:771:0,
>                 from include/trace/define_trace.h:96,
>                 from include/trace/events/rpm.h:99,
>                 from kernel/trace/rpm-traces.c:15:
> include/trace/events/rpm.h: In function 'perf_trace_rpm_internal':
> include/trace/events/rpm.h:16:1: error: 'struct dev_pm_info' has no member named 'usage_count'
> include/trace/events/rpm.h:16:1: error: 'struct dev_pm_info' has no member named 'disable_depth'
> include/trace/events/rpm.h:16:1: error: 'struct dev_pm_info' has no member named 'runtime_auto'
> include/trace/events/rpm.h:16:1: error: 'struct dev_pm_info' has no member named 'request_pending'
> include/trace/events/rpm.h:16:1: error: 'struct dev_pm_info' has no member named 'irq_safe'
> include/trace/events/rpm.h:16:1: error: 'struct dev_pm_info' has no member named 'child_count'
>
> Presumably caused by commit 53b615ccca56 ("PM / Runtime: Introduce trace
> points for tracing rpm_* functions").
>
> I have used the pm tree from next-20110927 for today.
> --
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
>

[-- Attachment #2: 0001-kernel-trace-rpm-traces.c-fix-build-failure-if-RUNTI.patch --]
[-- Type: text/x-patch, Size: 910 bytes --]

From feb037e957149f0dc405b80b4bb9cdafec6fcb0f Mon Sep 17 00:00:00 2001
From: Ming Lei <ming.lei@canonical.com>
Date: Wed, 28 Sep 2011 13:07:04 +0800
Subject: [PATCH] kernel/trace/rpm-traces.c: fix build failure if RUNTIME_PM
unset

Signed-off-by: Ming Lei <ming.lei@canonical.com>
---
kernel/trace/rpm-traces.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/kernel/trace/rpm-traces.c b/kernel/trace/rpm-traces.c
index 998949e..c161c5e 100644
--- a/kernel/trace/rpm-traces.c
+++ b/kernel/trace/rpm-traces.c
@@ -11,6 +11,7 @@
#include <linux/module.h>
#include <linux/usb.h>

+#ifdef CONFIG_PM_RUNTIME
#define CREATE_TRACE_POINTS
#include <trace/events/rpm.h>

@@ -18,4 +19,5 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(rpm_return_int);
EXPORT_TRACEPOINT_SYMBOL_GPL(rpm_idle);
EXPORT_TRACEPOINT_SYMBOL_GPL(rpm_suspend);
EXPORT_TRACEPOINT_SYMBOL_GPL(rpm_resume);
+#endif

--
1.7.5.4