diff --git a/common-bsp/recipes-kernel/linux/linux-beagleboard-3.8/0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch b/common-bsp/recipes-kernel/linux/linux-beagleboard-3.8/0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch new file mode 100644 index 00000000..3fc4ed85 --- /dev/null +++ b/common-bsp/recipes-kernel/linux/linux-beagleboard-3.8/0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch @@ -0,0 +1,52 @@ +From aeea3592a13bf12861943e44fc48f1f270941f8d Mon Sep 17 00:00:00 2001 +From: Behan Webster +Date: Wed, 24 Sep 2014 01:06:46 +0100 +Subject: [PATCH] ARM: 8158/1: LLVMLinux: use static inline in ARM ftrace.h + +With compilers which follow the C99 standard (like modern versions of gcc and +clang), "extern inline" does the wrong thing (emits code for an externally +linkable version of the inline function). In this case using static inline +and removing the NULL version of return_address in return_address.c does +the right thing. + +Signed-off-by: Behan Webster +Reviewed-by: Mark Charlebois +Acked-by: Steven Rostedt +Signed-off-by: Russell King +--- + arch/arm/include/asm/ftrace.h | 2 +- + arch/arm/kernel/return_address.c | 5 ----- + 2 files changed, 1 insertion(+), 6 deletions(-) + +diff --git a/arch/arm/include/asm/ftrace.h b/arch/arm/include/asm/ftrace.h +index 39eb16b..bfe2a2f 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 fafedd8..f6aa84d 100644 +--- a/arch/arm/kernel/return_address.c ++++ b/arch/arm/kernel/return_address.c +@@ -63,11 +63,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); +-- +2.1.4 + diff --git a/common-bsp/recipes-kernel/linux/linux-beagleboard-3.8/0001-Input-lifebook-use-static-inline-instead-of-inline-i.patch b/common-bsp/recipes-kernel/linux/linux-beagleboard-3.8/0001-Input-lifebook-use-static-inline-instead-of-inline-i.patch new file mode 100644 index 00000000..a4a0e3e9 --- /dev/null +++ b/common-bsp/recipes-kernel/linux/linux-beagleboard-3.8/0001-Input-lifebook-use-static-inline-instead-of-inline-i.patch @@ -0,0 +1,46 @@ +From bd447b61c49fc26f0299587db3e6d66da49dc529 Mon Sep 17 00:00:00 2001 +From: Chen Gang +Date: Sun, 9 Nov 2014 13:31:11 -0800 +Subject: [PATCH] Input: lifebook - use "static inline" instead of "inline" in + lifebook.h + +For functions defined in header files we should use static inline rather +than inline, which breaks under the latest upstream gcc (which is really +gcc issue, but static inline is better suited regardless). + +The related error (with allmodconfig under tile): + + MODPOST 4002 modules + ERROR: "lifebook_detect" [drivers/input/mouse/psmouse.ko] undefined! + +Signed-off-by: Chen Gang +Signed-off-by: Dmitry Torokhov +--- + drivers/input/mouse/lifebook.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/drivers/input/mouse/lifebook.h b/drivers/input/mouse/lifebook.h +index 4c4326c..0baf02a 100644 +--- a/drivers/input/mouse/lifebook.h ++++ b/drivers/input/mouse/lifebook.h +@@ -16,14 +16,14 @@ void lifebook_module_init(void); + int lifebook_detect(struct psmouse *psmouse, bool set_properties); + int lifebook_init(struct psmouse *psmouse); + #else +-inline void lifebook_module_init(void) ++static inline void lifebook_module_init(void) + { + } +-inline int lifebook_detect(struct psmouse *psmouse, bool set_properties) ++static inline int lifebook_detect(struct psmouse *psmouse, bool set_properties) + { + return -ENOSYS; + } +-inline int lifebook_init(struct psmouse *psmouse) ++static inline int lifebook_init(struct psmouse *psmouse) + { + return -ENOSYS; + } +-- +2.1.4 + diff --git a/common-bsp/recipes-kernel/linux/linux-beagleboard-3.8/0001-kernel-add-support-for-gcc-5.patch b/common-bsp/recipes-kernel/linux/linux-beagleboard-3.8/0001-kernel-add-support-for-gcc-5.patch new file mode 100644 index 00000000..33e1bcad --- /dev/null +++ b/common-bsp/recipes-kernel/linux/linux-beagleboard-3.8/0001-kernel-add-support-for-gcc-5.patch @@ -0,0 +1,97 @@ +From 71458cfc782eafe4b27656e078d379a34e472adf Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 13 Oct 2014 15:51:05 -0700 +Subject: [PATCH] kernel: add support for gcc 5 + +We're missing include/linux/compiler-gcc5.h which is required now +because gcc branched off to v5 in trunk. + +Just copy the relevant bits out of include/linux/compiler-gcc4.h, +no new code is added as of now. + +This fixes a build error when using gcc 5. + +Signed-off-by: Sasha Levin +Cc: +Signed-off-by: Andrew Morton +Signed-off-by: Linus Torvalds +--- + include/linux/compiler-gcc5.h | 66 +++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 66 insertions(+) + create mode 100644 include/linux/compiler-gcc5.h + +diff --git a/include/linux/compiler-gcc5.h b/include/linux/compiler-gcc5.h +new file mode 100644 +index 0000000..cdd1cc2 +--- /dev/null ++++ b/include/linux/compiler-gcc5.h +@@ -0,0 +1,66 @@ ++#ifndef __LINUX_COMPILER_H ++#error "Please don't include directly, include instead." ++#endif ++ ++#define __used __attribute__((__used__)) ++#define __must_check __attribute__((warn_unused_result)) ++#define __compiler_offsetof(a, b) __builtin_offsetof(a, b) ++ ++/* Mark functions as cold. gcc will assume any path leading to a call ++ to them will be unlikely. This means a lot of manual unlikely()s ++ are unnecessary now for any paths leading to the usual suspects ++ like BUG(), printk(), panic() etc. [but let's keep them for now for ++ older compilers] ++ ++ Early snapshots of gcc 4.3 don't support this and we can't detect this ++ in the preprocessor, but we can live with this because they're unreleased. ++ Maketime probing would be overkill here. ++ ++ gcc also has a __attribute__((__hot__)) to move hot functions into ++ a special section, but I don't see any sense in this right now in ++ the kernel context */ ++#define __cold __attribute__((__cold__)) ++ ++#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__) ++ ++#ifndef __CHECKER__ ++# define __compiletime_warning(message) __attribute__((warning(message))) ++# define __compiletime_error(message) __attribute__((error(message))) ++#endif /* __CHECKER__ */ ++ ++/* ++ * Mark a position in code as unreachable. This can be used to ++ * suppress control flow warnings after asm blocks that transfer ++ * control elsewhere. ++ * ++ * Early snapshots of gcc 4.5 don't support this and we can't detect ++ * this in the preprocessor, but we can live with this because they're ++ * unreleased. Really, we need to have autoconf for the kernel. ++ */ ++#define unreachable() __builtin_unreachable() ++ ++/* Mark a function definition as prohibited from being cloned. */ ++#define __noclone __attribute__((__noclone__)) ++ ++/* ++ * Tell the optimizer that something else uses this function or variable. ++ */ ++#define __visible __attribute__((externally_visible)) ++ ++/* ++ * GCC 'asm goto' miscompiles certain code sequences: ++ * ++ * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670 ++ * ++ * Work it around via a compiler barrier quirk suggested by Jakub Jelinek. ++ * Fixed in GCC 4.8.2 and later versions. ++ * ++ * (asm goto is automatically volatile - the naming reflects this.) ++ */ ++#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0) ++ ++#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP ++#define __HAVE_BUILTIN_BSWAP32__ ++#define __HAVE_BUILTIN_BSWAP64__ ++#define __HAVE_BUILTIN_BSWAP16__ ++#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */ +-- +2.1.4 + diff --git a/common-bsp/recipes-kernel/linux/linux-beagleboard_3.8.bb b/common-bsp/recipes-kernel/linux/linux-beagleboard_3.8.bb index 70eedaf9..0a17a9eb 100644 --- a/common-bsp/recipes-kernel/linux/linux-beagleboard_3.8.bb +++ b/common-bsp/recipes-kernel/linux/linux-beagleboard_3.8.bb @@ -37,7 +37,10 @@ SRC_URI += " \ file://btrfs/0009-btrfs-add-lz4hc-wrapper-and-enable-it.patch \ file://btrfs/0010-btrfs-reduce-duplicate-code-in-lz4_wrapper.c.patch \ file://btrfs/0011-btrfs-select-LZ4-HC-libs.patch \ - file://0001-net-add-proper-db.txt.patch \ + file://0001-net-add-proper-db.txt.patch \ + file://0001-kernel-add-support-for-gcc-5.patch \ + file://0001-ARM-8158-1-LLVMLinux-use-static-inline-in-ARM-ftrace.patch \ + file://0001-Input-lifebook-use-static-inline-instead-of-inline-i.patch \ file://defconfig \ file://am335x-pm-firmware.bin \ file://logo_linux_clut224.ppm \