aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-6.1/100-compiler.h-only-include-asm-rwonce.h-for-kernel-code.patch
diff options
context:
space:
mode:
authorChristian Marangi <ansuelsmth@gmail.com>2023-05-22 18:07:49 +0200
committerChristian Marangi <ansuelsmth@gmail.com>2023-05-22 22:28:17 +0200
commit4ed347aaad5de7b50d047f29aa99138b9b265daa (patch)
tree5752ff821b8834c0ebd8fc7d77714f1879c98bc4 /target/linux/generic/pending-6.1/100-compiler.h-only-include-asm-rwonce.h-for-kernel-code.patch
parentaa56d00aa624ffdc3ed839300d1284f890d31bf7 (diff)
downloadupstream-4ed347aaad5de7b50d047f29aa99138b9b265daa.tar.gz
upstream-4ed347aaad5de7b50d047f29aa99138b9b265daa.tar.bz2
upstream-4ed347aaad5de7b50d047f29aa99138b9b265daa.zip
generic: 6.1: refresh pending patches
Refresh pending patches with make target/linux/refresh. Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Diffstat (limited to 'target/linux/generic/pending-6.1/100-compiler.h-only-include-asm-rwonce.h-for-kernel-code.patch')
-rw-r--r--target/linux/generic/pending-6.1/100-compiler.h-only-include-asm-rwonce.h-for-kernel-code.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/pending-6.1/100-compiler.h-only-include-asm-rwonce.h-for-kernel-code.patch b/target/linux/generic/pending-6.1/100-compiler.h-only-include-asm-rwonce.h-for-kernel-code.patch
index 22f52c1d462..7b342e69623 100644
--- a/target/linux/generic/pending-6.1/100-compiler.h-only-include-asm-rwonce.h-for-kernel-code.patch
+++ b/target/linux/generic/pending-6.1/100-compiler.h-only-include-asm-rwonce.h-for-kernel-code.patch
@@ -11,16 +11,16 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
-@@ -220,6 +220,8 @@ void ftrace_likely_update(struct ftrace_
- #define function_nocfi(x) (x)
- #endif
+@@ -203,6 +203,8 @@ void ftrace_likely_update(struct ftrace_
+ __v; \
+ })
+#include <asm/rwonce.h>
+
#endif /* __KERNEL__ */
/*
-@@ -252,6 +254,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()