From: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: Randy Dunlap <rdunlap@infradead.org>,
Stephen Rothwell <sfr@canb.auug.org.au>,
"linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Linux MM <linux-mm@kvack.org>,
Andrew Morton <akpm@linux-foundation.org>,
Jim Davis <jim.epost@gmail.com>,
Chen Gong <gong.chen@linux.intel.com>
Subject: Re: linux-next: Tree for May 18 (mm/memory-failure.c)
Date: Wed, 20 May 2015 05:36:15 +0000 [thread overview]
Message-ID: <20150520053614.GA6236@hori1.linux.bs1.fc.nec.co.jp> (raw)
In-Reply-To: <20150519094636.67c9a4a3@gandalf.local.home>
On Tue, May 19, 2015 at 09:46:36AM -0400, Steven Rostedt wrote:
...
> > diff --git a/include/ras/ras_event.h b/include/ras/ras_event.h
> > index 1443d79e4fe6..43054c0fcf65 100644
> > --- a/include/ras/ras_event.h
> > +++ b/include/ras/ras_event.h
> > @@ -1,6 +1,8 @@
> > #undef TRACE_SYSTEM
> > #define TRACE_SYSTEM ras
> > #define TRACE_INCLUDE_FILE ras_event
> > +#undef TRACE_INCLUDE_PATH
> > +#define TRACE_INCLUDE_PATH ../../include/ras
>
> Note, ideally, you want:
>
> #define TRACE_INCLUDE_PATH .
OK, so we had better move include/ras/ras_event.h under include/trace/events.
I'll do this in a separate work.
> and change the Makefile to have:
>
> CFLAGS_ras.o := -I$(src)
It seems that if we do both of these, I hit the following error:
CC drivers/ras/ras.o
In file included from include/trace/events/ras_event.h:327,
from drivers/ras/ras.c:13:
include/trace/define_trace.h:83:43: error: ./ras_event.h: No such file or directory
, so I guess it's enough to do either.
> ...
>
>
> >
> > #if !defined(_TRACE_HW_EVENT_MC_H) || defined(TRACE_HEADER_MULTI_READ)
> > #define _TRACE_HW_EVENT_MC_H
> > diff --git a/mm/memory-failure.c b/mm/memory-failure.c
> > index 8cbe23ac1056..e88e14d87571 100644
> > --- a/mm/memory-failure.c
> > +++ b/mm/memory-failure.c
> > @@ -57,6 +57,7 @@
> > #include <linux/mm_inline.h>
> > #include <linux/kfifo.h>
> > #include "internal.h"
> > +#define CREATE_TRACE_POINTS
> > #include "ras/ras_event.h"
>
> Um, you can only define CREATE_TRACE_POINTS for a single instance.
> Otherwise you will be making duplicate functions with the same name and
> same variables.
>
> That is, you must either pick CREATE_TRACE_POINTS for ras_event.h in
> mm/memory-failure.c or drivers/ras/ras.c. Not both.
OK, so it seems that the root cause of the original error is a wrong
dependency among CONFIGs.
CONFIG_RAS should depend on CONFIG_MEMORY_FAILURE, but that is not true
(CONFIG_RAS=n and CONFIG_MEMORY_FAILURE=y in Randy's .config.)
This problem is visible when CONFIG_X86_64=n and CONFIG_SPARSEMEM=n (and all
other dependencies of CONFIG_RAS from ACPI_EXTLOG/PCIEAER/EDAC are false).
I'll fix such dependency.
Thanks,
Naoya Horiguchi
next prev parent reply other threads:[~2015-05-20 5:51 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-18 8:52 linux-next: Tree for May 18 Stephen Rothwell
2015-05-18 15:20 ` linux-next: Tree for May 18 (mm/memory-failure.c) Randy Dunlap
2015-05-19 2:49 ` Naoya Horiguchi
2015-05-19 4:40 ` Randy Dunlap
2015-05-19 13:46 ` Steven Rostedt
2015-05-20 5:36 ` Naoya Horiguchi [this message]
2015-05-20 6:01 ` [PATCH v2 1/2] ras: hwpoison: fix build failure around trace_memory_failure_event Naoya Horiguchi
2015-05-20 6:03 ` [PATCH 2/2] trace, ras: move ras_event.h under include/trace/events Naoya Horiguchi
2015-05-20 7:16 ` Naoya Horiguchi
2015-05-20 8:15 ` [PATCH v2] " Naoya Horiguchi
2015-05-20 5:41 ` linux-next: Tree for May 18 (mm/memory-failure.c) Xie XiuQi
2015-05-20 6:09 ` Naoya Horiguchi
2015-05-20 6:19 ` Xie XiuQi
2015-05-20 20:03 ` Andrew Morton
2015-05-21 0:17 ` Stephen Rothwell
2015-05-21 8:23 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150520053614.GA6236@hori1.linux.bs1.fc.nec.co.jp \
--to=n-horiguchi@ah.jp.nec.com \
--cc=akpm@linux-foundation.org \
--cc=gong.chen@linux.intel.com \
--cc=jim.epost@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-next@vger.kernel.org \
--cc=rdunlap@infradead.org \
--cc=rostedt@goodmis.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).