rust: helpers: Move #define __rust_helper out of atomic.c
In order to support inline helpers [1], we need to have __rust_helper defined for all helper files. Current we are lucky that atomic.c is the first file in helpers.c, but this is fragile. Thus, move it to helpers.c. [boqun: Reword the commit message and apply file hash changes] Link: https://lore.kernel.org/r/20260105-define-rust-helper-v2-0-51da5f454a67@google.com [1] Signed-off-by: Alice Ryhl <aliceryhl@google.com> Signed-off-by: Boqun Feng <boqun.feng@gmail.com> Link: https://patch.msgid.link/20260107-move-rust_helper-define-v1-1-4109d58ef275@google.com
This commit is contained in:
parent
5628f0510a
commit
abf2111d8d
3 changed files with 3 additions and 11 deletions
|
|
@ -11,11 +11,6 @@
|
||||||
|
|
||||||
#include <linux/atomic.h>
|
#include <linux/atomic.h>
|
||||||
|
|
||||||
// TODO: Remove this after INLINE_HELPERS support is added.
|
|
||||||
#ifndef __rust_helper
|
|
||||||
#define __rust_helper
|
|
||||||
#endif
|
|
||||||
|
|
||||||
__rust_helper int
|
__rust_helper int
|
||||||
rust_helper_atomic_read(const atomic_t *v)
|
rust_helper_atomic_read(const atomic_t *v)
|
||||||
{
|
{
|
||||||
|
|
@ -1037,4 +1032,4 @@ rust_helper_atomic64_dec_if_positive(atomic64_t *v)
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* _RUST_ATOMIC_API_H */
|
#endif /* _RUST_ATOMIC_API_H */
|
||||||
// 615a0e0c98b5973a47fe4fa65e92935051ca00ed
|
// e4edb6174dd42a265284958f00a7cea7ddb464b1
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,8 @@
|
||||||
* Sorted alphabetically.
|
* Sorted alphabetically.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#define __rust_helper
|
||||||
|
|
||||||
#include "atomic.c"
|
#include "atomic.c"
|
||||||
#include "atomic_ext.c"
|
#include "atomic_ext.c"
|
||||||
#include "auxiliary.c"
|
#include "auxiliary.c"
|
||||||
|
|
|
||||||
|
|
@ -47,11 +47,6 @@ cat << EOF
|
||||||
|
|
||||||
#include <linux/atomic.h>
|
#include <linux/atomic.h>
|
||||||
|
|
||||||
// TODO: Remove this after INLINE_HELPERS support is added.
|
|
||||||
#ifndef __rust_helper
|
|
||||||
#define __rust_helper
|
|
||||||
#endif
|
|
||||||
|
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
grep '^[a-z]' "$1" | while read name meta args; do
|
grep '^[a-z]' "$1" | while read name meta args; do
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue