Re: linux-next: Tree for May 18 (mm/memory-failure.c)

[Naoya Horiguchi]

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 <n-horiguchi@xxxxxxxxxxxxx>
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 <rdunlap@xxxxxxxxxxxxx>
Reported-by: Jim Davis <jim.epost@xxxxxxxxx>
Signed-off-by: Naoya Horiguchi <n-horiguchi@xxxxxxxxxxxxx>
---
 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 <linux/ras.h>
 
 #define CREATE_TRACE_POINTS
-#define TRACE_INCLUDE_PATH ../../include/ras
 #include <ras/ras_event.h>
 
 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 <linux/mm_inline.h>
 #include <linux/kfifo.h>
 #include "internal.h"
+#define CREATE_TRACE_POINTS
 #include "ras/ras_event.h"
 
 int sysctl_memory_failure_early_kill __read_mostly = 0;
-- 
2.1.0
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/