2017-06-06 21:19:05 +00:00
|
|
|
--- a/arch/arm/include/asm/ftrace.h
|
|
|
|
+++ b/arch/arm/include/asm/ftrace.h
|
2017-06-04 22:18:48 +00:00
|
|
|
@@ -45,7 +45,7 @@
|
|
|
|
|
|
|
|
#else
|
|
|
|
|
|
|
|
-extern inline void *return_address(unsigned int level)
|
|
|
|
+static inline void *return_address(unsigned int level)
|
|
|
|
{
|
|
|
|
return NULL;
|
|
|
|
}
|
2017-06-06 21:19:05 +00:00
|
|
|
--- a/arch/arm/kernel/return_address.c
|
|
|
|
+++ b/arch/arm/kernel/return_address.c
|
2017-06-04 22:18:48 +00:00
|
|
|
@@ -58,11 +58,6 @@
|
|
|
|
|
|
|
|
#else /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) */
|
|
|
|
|
|
|
|
-void *return_address(unsigned int level)
|
|
|
|
-{
|
|
|
|
- return NULL;
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
#endif /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) / else */
|
|
|
|
|
|
|
|
EXPORT_SYMBOL_GPL(return_address);
|