generic: 5.15: rework pending patch

[openwrt/staging/jow.git] / target / linux / generic / pending-5.15 / 100-compiler.h-only-include-asm-rwonce.h-for-kernel-code.patch

diff --git a/target/linux/generic/pending-5.15/100-compiler.h-only-include-asm-rwonce.h-for-kernel-code.patch b/target/linux/generic/pending-5.15/100-compiler.h-only-include-asm-rwonce.h-for-kernel-code.patch
index 282c8196e5fdb88c25374da4e7506b2854ab50ef..39b98eac1b055c4e4c1155e7bc97f26fa25b1416 100644 (file)
--- a/target/linux/generic/pending-5.15/100-compiler.h-only-include-asm-rwonce.h-for-kernel-code.patch
+++ b/target/linux/generic/pending-5.15/100-compiler.h-only-include-asm-rwonce.h-for-kernel-code.patch
@@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/include/linux/compiler.h
 +++ b/include/linux/compiler.h
-@@ -213,6 +213,8 @@ void ftrace_likely_update(struct ftrace_
+@@ -211,6 +211,8 @@ void ftrace_likely_update(struct ftrace_
        __v;                                                            \
  })
  
@@ -20,7 +20,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  #endif /* __KERNEL__ */
  
  /*
-@@ -245,6 +247,4 @@ static inline void *offset_to_ptr(const
+@@ -243,6 +245,4 @@ static inline void *offset_to_ptr(const
   */
  #define prevent_tail_call_optimization()      mb()