From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752626AbbESCwg (ORCPT ); Mon, 18 May 2015 22:52:36 -0400 Received: from TYO201.gate.nec.co.jp ([210.143.35.51]:52164 "EHLO tyo201.gate.nec.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751900AbbESCwf convert rfc822-to-8bit (ORCPT ); Mon, 18 May 2015 22:52:35 -0400 From: Naoya Horiguchi To: Randy Dunlap CC: Stephen Rothwell , "linux-next@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Linux MM , Steven Rostedt , Andrew Morton , Jim Davis , Chen Gong Subject: Re: linux-next: Tree for May 18 (mm/memory-failure.c) Thread-Topic: linux-next: Tree for May 18 (mm/memory-failure.c) Thread-Index: AQHQkd5wv24yy2/acEuU2FEWodRJZg== Date: Tue, 19 May 2015 02:49:34 +0000 Message-ID: <20150519024933.GA1614@hori1.linux.bs1.fc.nec.co.jp> References: <20150518185226.23154d47@canb.auug.org.au> <555A0327.9060709@infradead.org> In-Reply-To: <555A0327.9060709@infradead.org> Accept-Language: ja-JP, en-US Content-Language: ja-JP X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.128.101.10] Content-Type: text/plain; charset="iso-2022-jp" Content-ID: <2F4B3B4E2F923C47B3A954904CAE6826@gisp.nec.co.jp> Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 #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" int sysctl_memory_failure_early_kill __read_mostly = 0; -- 2.1.0