mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-21 06:33:41 +00:00
fa79baf4a6
Copy backport, hack, pending patch and config from 5.15 to 6.1. Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
30 lines
842 B
Diff
30 lines
842 B
Diff
From: Felix Fietkau <nbd@nbd.name>
|
|
Date: Thu, 22 Oct 2020 22:00:03 +0200
|
|
Subject: [PATCH] compiler.h: only include asm/rwonce.h for kernel code
|
|
|
|
This header file is not in uapi, which makes any user space code that includes
|
|
linux/compiler.h to fail with the error 'asm/rwonce.h: No such file or directory'
|
|
|
|
Fixes: e506ea451254 ("compiler.h: Split {READ,WRITE}_ONCE definitions out into rwonce.h")
|
|
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
|
|
|
|
+#include <asm/rwonce.h>
|
|
+
|
|
#endif /* __KERNEL__ */
|
|
|
|
/*
|
|
@@ -252,6 +254,4 @@ static inline void *offset_to_ptr(const
|
|
*/
|
|
#define prevent_tail_call_optimization() mb()
|
|
|
|
-#include <asm/rwonce.h>
|
|
-
|
|
#endif /* __LINUX_COMPILER_H */
|