mirror of
https://github.com/Fishwaldo/build.git
synced 2025-03-23 07:11:26 +00:00
30 lines
880 B
Diff
30 lines
880 B
Diff
|
diff --git a/arch/arm/include/asm/ftrace.h b/arch/arm/include/asm/ftrace.h
|
||
|
|
index f89515a..2bb8cac 100644
|
||
|
|
--- a/arch/arm/include/asm/ftrace.h
|
||
|
|
+++ b/arch/arm/include/asm/ftrace.h
|
||
|
|
@@ -45,7 +45,7 @@ void *return_address(unsigned int);
|
||
|
|
|
||
|
|
#else
|
||
|
|
|
||
|
|
-extern inline void *return_address(unsigned int level)
|
||
|
|
+static inline void *return_address(unsigned int level)
|
||
|
|
{
|
||
|
|
return NULL;
|
||
|
|
}
|
||
|
|
diff --git a/arch/arm/kernel/return_address.c b/arch/arm/kernel/return_address.c
|
||
|
|
index 8085417..57827a6 100644
|
||
|
|
--- a/arch/arm/kernel/return_address.c
|
||
|
|
+++ b/arch/arm/kernel/return_address.c
|
||
|
|
@@ -62,11 +62,6 @@ void *return_address(unsigned int level)
|
||
|
|
#warning "TODO: return_address should use unwind tables"
|
||
|
|
#endif
|
||
|
|
|
||
|
|
-void *return_address(unsigned int level)
|
||
|
|
-{
|
||
|
|
- return NULL;
|
||
|
|
-}
|
||
|
|
-
|
||
|
|
#endif /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) / else */
|
||
|
|
|
||
|
|
EXPORT_SYMBOL_GPL(return_address);
|