aboutsummaryrefslogtreecommitdiff
path: root/scripts/atomic
diff options
context:
space:
mode:
authorMark Brown <[email protected]>2023-10-23 19:38:22 +0100
committerMark Brown <[email protected]>2023-10-23 19:38:22 +0100
commit4fc4db7a68c2c04522880c4f89317f7874a4188f (patch)
treedc7e38eb44e2e4eb177245c157869ff301287590 /scripts/atomic
parent61f85372d293241f4139731c14cab9ac8e9436fb (diff)
parent05d3ef8bba77c1b5f98d941d8b2d4aeab8118ef1 (diff)
ASoC: Merge up v6.6-rc7
Get fixes needed so we can enable build of ams-delta in more configurations.
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