summaryrefslogtreecommitdiffstats
path: root/scripts/atomic
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2023-10-09 18:09:23 +0200
committerIngo Molnar <mingo@kernel.org>2023-10-09 18:09:23 +0200
commitfdb8b7a1af31d69ee1c8ddc02926cb409eaaecc3 (patch)
tree9af7010f5f93005adbf6f98c6557552b86d32697 /scripts/atomic
parentlocking/seqlock: Fix typo in comment (diff)
parentLinux 6.6-rc5 (diff)
downloadlinux-fdb8b7a1af31d69ee1c8ddc02926cb409eaaecc3.tar.xz
linux-fdb8b7a1af31d69ee1c8ddc02926cb409eaaecc3.zip
Merge tag 'v6.6-rc5' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'scripts/atomic')
-rwxr-xr-xscripts/atomic/gen-atomic-fallback.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/atomic/gen-atomic-fallback.sh b/scripts/atomic/gen-atomic-fallback.sh
index c0c8a85d7c81..a45154cefa48 100755
--- a/scripts/atomic/gen-atomic-fallback.sh
+++ b/scripts/atomic/gen-atomic-fallback.sh
@@ -102,7 +102,7 @@ gen_proto_order_variant()
fi
# Allow ACQUIRE/RELEASE/RELAXED ops to be defined in terms of FULL ops
- if [ ! -z "${order}" ]; then
+ if [ ! -z "${order}" ] && ! meta_is_implicitly_relaxed "${meta}"; then
printf "#elif defined(arch_${basename})\n"
printf "\t${retstmt}arch_${basename}(${args});\n"
fi