diff options
| author | Maxime Ripard <mripard@kernel.org> | 2026-02-23 13:48:20 +0300 |
|---|---|---|
| committer | Maxime Ripard <mripard@kernel.org> | 2026-02-23 13:48:20 +0300 |
| commit | 8b85987d3cf50178f67618122d9f3bb202f62f42 (patch) | |
| tree | 4edbfdfa246e69ce05becf7fd944d60a2c89009e /scripts/atomic | |
| parent | a480f5c6f5fa14c954aa8c462302d34223947510 (diff) | |
| parent | 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f (diff) | |
| download | linux-8b85987d3cf50178f67618122d9f3bb202f62f42.tar.xz | |
Merge drm/drm-next into drm-misc-next
Let's merge 7.0-rc1 to start the new drm-misc-next window
Signed-off-by: Maxime Ripard <mripard@kernel.org>
Diffstat (limited to 'scripts/atomic')
| -rwxr-xr-x | scripts/atomic/gen-rust-atomic-helpers.sh | 5 | ||||
| -rw-r--r-- | scripts/atomic/kerneldoc/try_cmpxchg | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/scripts/atomic/gen-rust-atomic-helpers.sh b/scripts/atomic/gen-rust-atomic-helpers.sh index 45b1e100ed7c..a3732153af29 100755 --- a/scripts/atomic/gen-rust-atomic-helpers.sh +++ b/scripts/atomic/gen-rust-atomic-helpers.sh @@ -47,11 +47,6 @@ cat << EOF #include <linux/atomic.h> -// TODO: Remove this after INLINE_HELPERS support is added. -#ifndef __rust_helper -#define __rust_helper -#endif - EOF grep '^[a-z]' "$1" | while read name meta args; do diff --git a/scripts/atomic/kerneldoc/try_cmpxchg b/scripts/atomic/kerneldoc/try_cmpxchg index 3ccff29538f5..4dfc7a167ea1 100644 --- a/scripts/atomic/kerneldoc/try_cmpxchg +++ b/scripts/atomic/kerneldoc/try_cmpxchg @@ -11,6 +11,6 @@ cat <<EOF * * ${desc_noinstr} * - * Return: @true if the exchange occured, @false otherwise. + * Return: @true if the exchange occurred, @false otherwise. */ EOF |