summaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/return_address.c
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2019-11-04 18:15:15 +0100
committerRussell King <rmk+kernel@armlinux.org.uk>2019-11-15 22:21:07 +0000
commitfb033c95c94ca1ee3d16e04ebdb85d65fb55fff8 (patch)
tree9f7e2fa0f16c00c156034299e46838f36451c039 /arch/arm/kernel/return_address.c
parentcb73737ea1d27181f5c4bfb1288e97f3e8a4abc7 (diff)
downloadlinux-stable-fb033c95c94ca1ee3d16e04ebdb85d65fb55fff8.tar.gz
linux-stable-fb033c95c94ca1ee3d16e04ebdb85d65fb55fff8.tar.bz2
linux-stable-fb033c95c94ca1ee3d16e04ebdb85d65fb55fff8.zip
ARM: 8918/2: only build return_address() if needed
The system currently warns if the config conditions for building return_address in arch/arm/kernel/return_address.c are not met, leaving just an EXPORT_SYMBOL_GPL(return_address) of a function defined to be 'static linline'. This is a result of aeea3592a13b ("ARM: 8158/1: LLVMLinux: use static inline in ARM ftrace.h"). Since we're not going to build anything other than an exported symbol for something that is already being defined to be an inline-able return of NULL, just avoid building the code to remove the following warning: Fixes: aeea3592a13b ("ARM: 8158/1: LLVMLinux: use static inline in ARM ftrace.h") Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk> Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Diffstat (limited to 'arch/arm/kernel/return_address.c')
-rw-r--r--arch/arm/kernel/return_address.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/kernel/return_address.c b/arch/arm/kernel/return_address.c
index b0d2f1fe891d..7b42ac010fdf 100644
--- a/arch/arm/kernel/return_address.c
+++ b/arch/arm/kernel/return_address.c
@@ -7,8 +7,6 @@
*/
#include <linux/export.h>
#include <linux/ftrace.h>
-
-#if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND)
#include <linux/sched.h>
#include <asm/stacktrace.h>
@@ -53,6 +51,4 @@ void *return_address(unsigned int level)
return NULL;
}
-#endif /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) */
-
EXPORT_SYMBOL_GPL(return_address);