[PATCH] NDS32: export __trace_hardirqs_on/_offf for entry/exit
From: Randy Dunlap
Date: Tue Sep 28 2021 - 01:27:04 EST
Add exports for __trace_hardirqs_on/_off and use them in
kernel/ex-entry.S and kernel/ex-exit.S to fix build/linker errors.
nds32le-linux-ld: arch/nds32/kernel/ex-entry.o: in function `fucop_ctl_done':
(.text+0x12a): undefined reference to `__trace_hardirqs_off'
(.text+0x12a): relocation truncated to fit: R_NDS32_25_PCREL_RELA against undefined symbol `__trace_hardirqs_off'
nds32le-linux-ld: arch/nds32/kernel/ex-exit.o: in function `no_work_pending':
(.text+0xea): undefined reference to `__trace_hardirqs_off'
nds32le-linux-ld: (.text+0xee): undefined reference to `__trace_hardirqs_off'
nds32le-linux-ld: (.text+0xf2): undefined reference to `__trace_hardirqs_on'
nds32le-linux-ld: (.text+0xf6): undefined reference to `__trace_hardirqs_on'
Fixes: 0cde56e0280d ("nds32: Fix a kernel panic issue because of wrong frame pointer access.")
Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
Cc: Nick Hu <nickhu@xxxxxxxxxxxxx>
Cc: Greentime Hu <green.hu@xxxxxxxxx>
Cc: Vincent Chen <deanbo422@xxxxxxxxx>
---
arch/nds32/include/asm/ftrace.h | 3 +++
arch/nds32/kernel/ex-entry.S | 1 +
arch/nds32/kernel/ex-exit.S | 2 +-
arch/nds32/kernel/ftrace.c | 3 +++
4 files changed, 8 insertions(+), 1 deletion(-)
--- linux-next-20210917.orig/arch/nds32/kernel/ftrace.c
+++ linux-next-20210917/arch/nds32/kernel/ftrace.c
@@ -276,8 +276,11 @@ noinline void __trace_hardirqs_off(void)
{
trace_hardirqs_off();
}
+EXPORT_SYMBOL(__trace_hardirqs_off);
+
noinline void __trace_hardirqs_on(void)
{
trace_hardirqs_on();
}
+EXPORT_SYMBOL(__trace_hardirqs_on);
#endif /* CONFIG_TRACE_IRQFLAGS */
--- linux-next-20210917.orig/arch/nds32/include/asm/ftrace.h
+++ linux-next-20210917/arch/nds32/include/asm/ftrace.h
@@ -15,6 +15,9 @@
extern void _mcount(unsigned long parent_ip);
+extern void __trace_hardirqs_off(void);
+extern void __trace_hardirqs_on(void);
+
#ifdef CONFIG_DYNAMIC_FTRACE
#define FTRACE_ADDR ((unsigned long)_ftrace_caller)
--- linux-next-20210917.orig/arch/nds32/kernel/ex-entry.S
+++ linux-next-20210917/arch/nds32/kernel/ex-entry.S
@@ -8,6 +8,7 @@
#include <asm/asm-offsets.h>
#include <asm/page.h>
#include <asm/fpu.h>
+#include <asm/ftrace.h>
#ifdef CONFIG_HWZOL
.macro push_zol
--- linux-next-20210917.orig/arch/nds32/kernel/ex-exit.S
+++ linux-next-20210917/arch/nds32/kernel/ex-exit.S
@@ -9,7 +9,7 @@
#include <asm/thread_info.h>
#include <asm/current.h>
#include <asm/fpu.h>
-
+#include <asm/ftrace.h>
#ifdef CONFIG_HWZOL