From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756141AbbESNqn (ORCPT ); Tue, 19 May 2015 09:46:43 -0400 Received: from smtprelay0095.hostedemail.com ([216.40.44.95]:36079 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753173AbbESNql (ORCPT ); Tue, 19 May 2015 09:46:41 -0400 X-Session-Marker: 726F737465647440676F6F646D69732E6F7267 X-Spam-Summary: 2,0,0,,d41d8cd98f00b204,rostedt@goodmis.org,:::::::::::::::::,RULES_HIT:41:355:379:541:599:800:877:960:973:988:989:1260:1277:1311:1313:1314:1345:1359:1437:1515:1516:1518:1534:1543:1593:1594:1711:1730:1747:1777:1792:2393:2553:2559:2562:2693:2899:3138:3139:3140:3141:3142:3354:3622:3865:3867:3868:3870:3871:3872:3873:3874:4321:4605:5007:6119:6261:7514:7576:7875:7903:7974:7996:9545:10004:10400:10848:10967:11026:11232:11473:11658:11914:12043:12296:12438:12517:12519:12555:12740:13180:13229:14096:14097:21060:21080,0,RBL:none,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:none,Custom_rules:0:0:0 X-HE-Tag: book95_1cea67000b54c X-Filterd-Recvd-Size: 4608 Date: Tue, 19 May 2015 09:46:36 -0400 From: Steven Rostedt To: Naoya Horiguchi Cc: Randy Dunlap , Stephen Rothwell , "linux-next@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Linux MM , Andrew Morton , Jim Davis , Chen Gong Subject: Re: linux-next: Tree for May 18 (mm/memory-failure.c) Message-ID: <20150519094636.67c9a4a3@gandalf.local.home> In-Reply-To: <20150519024933.GA1614@hori1.linux.bs1.fc.nec.co.jp> References: <20150518185226.23154d47@canb.auug.org.au> <555A0327.9060709@infradead.org> <20150519024933.GA1614@hori1.linux.bs1.fc.nec.co.jp> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.25; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 19 May 2015 02:49:34 +0000 Naoya Horiguchi wrote: > On Mon, May 18, 2015 at 08:20:07AM -0700, Randy Dunlap wrote: > > On 05/18/15 01:52, Stephen Rothwell wrote: > > > Hi all, > > > > > > Changes since 20150515: > > > > > > > on i386: > > > > mm/built-in.o: In function `action_result': > > memory-failure.c:(.text+0x344a5): undefined reference to `__tracepoint_memory_failure_event' > > memory-failure.c:(.text+0x344d5): undefined reference to `__tracepoint_memory_failure_event' > > memory-failure.c:(.text+0x3450c): undefined reference to `__tracepoint_memory_failure_event' > > Thanks for the reporting, Randy. > Here is a patch for this problem, could you try it? > > Thanks, > Naoya > --- > From: Naoya Horiguchi > Subject: [PATCH] ras: hwpoison: fix build failure around > trace_memory_failure_event > > next-20150515 fails to build on i386 with the following error: > > mm/built-in.o: In function `action_result': > memory-failure.c:(.text+0x344a5): undefined reference to `__tracepoint_memory_failure_event' > memory-failure.c:(.text+0x344d5): undefined reference to `__tracepoint_memory_failure_event' > memory-failure.c:(.text+0x3450c): undefined reference to `__tracepoint_memory_failure_event' > > Defining CREATE_TRACE_POINTS and TRACE_INCLUDE_PATH fixes it. > > Reported-by: Randy Dunlap > Reported-by: Jim Davis > Signed-off-by: Naoya Horiguchi > --- > drivers/ras/ras.c | 1 - > include/ras/ras_event.h | 2 ++ > mm/memory-failure.c | 1 + > 3 files changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/ras/ras.c b/drivers/ras/ras.c > index b67dd362b7b6..3e2745d8e221 100644 > --- a/drivers/ras/ras.c > +++ b/drivers/ras/ras.c > @@ -9,7 +9,6 @@ > #include > > #define CREATE_TRACE_POINTS > -#define TRACE_INCLUDE_PATH ../../include/ras > #include > > static int __init ras_init(void) > 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 . and change the Makefile to have: CFLAGS_ras.o := -I$(src) ... > > #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 > #include > #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. -- Steve > > int sysctl_memory_failure_early_kill __read_mostly = 0;