kernel: Make the patches apply on top of 4.19

[openwrt/staging/chunkeey.git] / target / linux / generic / pending-4.19 / 220-optimize_inlining.patch

diff --git a/target/linux/generic/pending-4.19/220-optimize_inlining.patch b/target/linux/generic/pending-4.19/220-optimize_inlining.patch
index dca1dcb20417eb208dea6eb388a7f4a50a8257c0..14115860868693b33fc61803805f96eb66e750d9 100644 (file)
--- a/target/linux/generic/pending-4.19/220-optimize_inlining.patch
+++ b/target/linux/generic/pending-4.19/220-optimize_inlining.patch
@@ -1,6 +1,6 @@
 --- a/arch/x86/Kconfig.debug
 +++ b/arch/x86/Kconfig.debug
-@@ -284,20 +284,6 @@ config CPA_DEBUG
+@@ -276,20 +276,6 @@ config CPA_DEBUG
        ---help---
          Do change_page_attr() self-tests every 30 seconds.
  
@@ -23,7 +23,7 @@
        depends on DEBUG_KERNEL
 --- a/lib/Kconfig.debug
 +++ b/lib/Kconfig.debug
-@@ -137,6 +137,20 @@ endmenu # "printk and dmesg options"
+@@ -150,6 +150,20 @@ endmenu # "printk and dmesg options"
  
  menu "Compile-time checks and compiler options"
  
@@ -46,7 +46,7 @@
        depends on DEBUG_KERNEL && !COMPILE_TEST
 --- a/arch/x86/Kconfig
 +++ b/arch/x86/Kconfig
-@@ -296,9 +296,6 @@ config ZONE_DMA32
+@@ -306,9 +306,6 @@ config ZONE_DMA32
  config AUDIT_ARCH
        def_bool y if X86_64
  
@@ -56,15 +56,15 @@
  config ARCH_SUPPORTS_DEBUG_PAGEALLOC
        def_bool y
  
---- a/include/linux/compiler-gcc.h
-+++ b/include/linux/compiler-gcc.h
-@@ -90,8 +90,7 @@
+--- a/include/linux/compiler_types.h
++++ b/include/linux/compiler_types.h
+@@ -260,8 +260,7 @@ struct ftrace_likely_data {
   * of extern inline functions at link time.
   * A lot of inline functions can cause havoc with function tracing.
   */
--#if !defined(CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING) ||              \
--    !defined(CONFIG_OPTIMIZE_INLINING) || (__GNUC__ < 4)
-+#if !defined(CONFIG_OPTIMIZE_INLINING) || (__GNUC__ < 4)
+-#if !defined(CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING) || \
+-      !defined(CONFIG_OPTIMIZE_INLINING)
++#if !defined(CONFIG_OPTIMIZE_INLINING)
  #define inline \
        inline __attribute__((always_inline, unused)) notrace __gnu_inline
  #else