From: Jasmin Jessich <jasmin@xxxxxx> The type definitions have been splitting from compiler.h into compiler_types.h. This requires to check for the new and the old include guard in compiler-gcc.h. Signed-off-by: Jasmin Jessich <jasmin@xxxxxx> --- backports/backports.txt | 3 +++ backports/v4.14_compiler_h.patch | 11 +++++++++++ 2 files changed, 14 insertions(+) create mode 100644 backports/v4.14_compiler_h.patch diff --git a/backports/backports.txt b/backports/backports.txt index 618c4e8..78dfb9c 100644 --- a/backports/backports.txt +++ b/backports/backports.txt @@ -26,6 +26,9 @@ add pr_fmt.patch add debug.patch add drx39xxj.patch +[4.14.255] +add v4.14_compiler_h.patch + [4.12.255] add v4.12_revert_solo6x10_copykerneluser.patch diff --git a/backports/v4.14_compiler_h.patch b/backports/v4.14_compiler_h.patch new file mode 100644 index 0000000..3faa85f --- /dev/null +++ b/backports/v4.14_compiler_h.patch @@ -0,0 +1,11 @@ +diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h +index 2272ded..744334e 100644 +--- a/include/linux/compiler-gcc.h ++++ b/include/linux/compiler-gcc.h +@@ -1,5 +1,5 @@ + /* SPDX-License-Identifier: GPL-2.0 */ +-#ifndef __LINUX_COMPILER_TYPES_H ++#if (!defined(__LINUX_COMPILER_TYPES_H) && !defined (__LINUX_COMPILER_H)) + #error "Please don't include <linux/compiler-gcc.h> directly, include <linux/compiler.h> instead." + #endif + -- 2.7.4
