aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-5.15/100-compiler.h-only-include-asm-rwonce.h-for-kernel-code.patch
diff options
context:
space:
mode:
authorAnsuel Smith <ansuelsmth@gmail.com>2022-03-21 15:22:20 +0100
committerDaniel Golle <daniel@makrotopia.org>2022-03-27 05:00:50 +0100
commit009f8afe06258adff30d83e936d097e42d5501ca (patch)
tree8d8059364dd135646aae277ace45e77674c19865 /target/linux/generic/pending-5.15/100-compiler.h-only-include-asm-rwonce.h-for-kernel-code.patch
parent49cb5e501a8d6eb8ff5cad63f13282de7b84e7ef (diff)
downloadupstream-009f8afe06258adff30d83e936d097e42d5501ca.tar.gz
upstream-009f8afe06258adff30d83e936d097e42d5501ca.tar.bz2
upstream-009f8afe06258adff30d83e936d097e42d5501ca.zip
generic: 5.15: refresh pending patch
Use 'make target/linux/refresh' to refresh pending patches. Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
Diffstat (limited to 'target/linux/generic/pending-5.15/100-compiler.h-only-include-asm-rwonce.h-for-kernel-code.patch')
-rw-r--r--target/linux/generic/pending-5.15/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-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 39b98eac1b..22f52c1d46 100644
--- 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,16 +11,16 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
-@@ -211,6 +211,8 @@ void ftrace_likely_update(struct ftrace_
- __v; \
- })
+@@ -220,6 +220,8 @@ void ftrace_likely_update(struct ftrace_
+ #define function_nocfi(x) (x)
+ #endif
+#include <asm/rwonce.h>
+
#endif /* __KERNEL__ */
/*
-@@ -243,6 +245,4 @@ static inline void *offset_to_ptr(const
+@@ -252,6 +254,4 @@ static inline void *offset_to_ptr(const
*/
#define prevent_tail_call_optimization() mb()