diff options
author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-04-12 14:05:39 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-04-13 09:30:40 +0000 |
commit | ac3620551872d8196505425648eaef9ee0bb771f (patch) | |
tree | 724ac00ed7585d53a9d3cce3c320abee9ae4a614 /meta-smx6-extras/recipes/linux/linux-smx6/0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch | |
parent | 17412f4a768e36ba5ecd899610f556424a9471df (diff) | |
download | meta-boot2qt-ac3620551872d8196505425648eaef9ee0bb771f.tar.gz |
smarc-samx6i: fix kernel build
Cherry-pick needed changes to make kernel build with gcc5
Change-Id: Ib930f4cc2601318d98f9bac246a209333859289f
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
Diffstat (limited to 'meta-smx6-extras/recipes/linux/linux-smx6/0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch')
-rw-r--r-- | meta-smx6-extras/recipes/linux/linux-smx6/0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/meta-smx6-extras/recipes/linux/linux-smx6/0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch b/meta-smx6-extras/recipes/linux/linux-smx6/0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch new file mode 100644 index 0000000..ee61a74 --- /dev/null +++ b/meta-smx6-extras/recipes/linux/linux-smx6/0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch | |||
@@ -0,0 +1,52 @@ | |||
1 | From ef372125fd64fc181869be4cf528488f9e8b46c2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Behan Webster <behanw@converseincode.com> | ||
3 | Date: Wed, 24 Sep 2014 01:06:46 +0100 | ||
4 | Subject: [PATCH] ARM: 8158/1: LLVMLinux: use static inline in ARM ftrace.h | ||
5 | |||
6 | With compilers which follow the C99 standard (like modern versions of gcc and | ||
7 | clang), "extern inline" does the wrong thing (emits code for an externally | ||
8 | linkable version of the inline function). In this case using static inline | ||
9 | and removing the NULL version of return_address in return_address.c does | ||
10 | the right thing. | ||
11 | |||
12 | Signed-off-by: Behan Webster <behanw@converseincode.com> | ||
13 | Reviewed-by: Mark Charlebois <charlebm@gmail.com> | ||
14 | Acked-by: Steven Rostedt <rostedt@goodmis.org> | ||
15 | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> | ||
16 | --- | ||
17 | arch/arm/include/asm/ftrace.h | 2 +- | ||
18 | arch/arm/kernel/return_address.c | 5 ----- | ||
19 | 2 files changed, 1 insertion(+), 6 deletions(-) | ||
20 | |||
21 | diff --git a/arch/arm/include/asm/ftrace.h b/arch/arm/include/asm/ftrace.h | ||
22 | index f89515a..2bb8cac 100644 | ||
23 | --- a/arch/arm/include/asm/ftrace.h | ||
24 | +++ b/arch/arm/include/asm/ftrace.h | ||
25 | @@ -45,7 +45,7 @@ void *return_address(unsigned int); | ||
26 | |||
27 | #else | ||
28 | |||
29 | -extern inline void *return_address(unsigned int level) | ||
30 | +static inline void *return_address(unsigned int level) | ||
31 | { | ||
32 | return NULL; | ||
33 | } | ||
34 | diff --git a/arch/arm/kernel/return_address.c b/arch/arm/kernel/return_address.c | ||
35 | index fafedd8..f6aa84d 100644 | ||
36 | --- a/arch/arm/kernel/return_address.c | ||
37 | +++ b/arch/arm/kernel/return_address.c | ||
38 | @@ -63,11 +63,6 @@ void *return_address(unsigned int level) | ||
39 | #warning "TODO: return_address should use unwind tables" | ||
40 | #endif | ||
41 | |||
42 | -void *return_address(unsigned int level) | ||
43 | -{ | ||
44 | - return NULL; | ||
45 | -} | ||
46 | - | ||
47 | #endif /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) / else */ | ||
48 | |||
49 | EXPORT_SYMBOL_GPL(return_address); | ||
50 | -- | ||
51 | 1.9.1 | ||
52 | |||