summaryrefslogtreecommitdiffstats
path: root/scripts/atomic/gen-atomic-long.sh
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2020-01-24 09:33:52 +0100
committerIngo Molnar <mingo@kernel.org>2020-01-24 09:35:51 +0100
commit7add7875a8eb4ffe5eddaf8a11e409c9e1b6e3f3 (patch)
tree62f720dcb9326470c76a38afb1c61a2b8cecce45 /scripts/atomic/gen-atomic-long.sh
parentMerge tag 'v5.5-rc7' into locking/kcsan, to refresh the tree (diff)
parentkcsan: Add __no_kcsan function attribute (diff)
downloadlinux-7add7875a8eb4ffe5eddaf8a11e409c9e1b6e3f3.tar.xz
linux-7add7875a8eb4ffe5eddaf8a11e409c9e1b6e3f3.zip
Merge branch 'kcsan.2020.01.07a' into locking/kcsan
Pull KCSAN updates from Paul E. McKenney: - UBSAN fixes - inlining updates - documentation updates Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'scripts/atomic/gen-atomic-long.sh')
-rwxr-xr-xscripts/atomic/gen-atomic-long.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/atomic/gen-atomic-long.sh b/scripts/atomic/gen-atomic-long.sh
index c240a7231b2e..e318d3f92e53 100755
--- a/scripts/atomic/gen-atomic-long.sh
+++ b/scripts/atomic/gen-atomic-long.sh
@@ -46,7 +46,7 @@ gen_proto_order_variant()
local retstmt="$(gen_ret_stmt "${meta}")"
cat <<EOF
-static inline ${ret}
+static __always_inline ${ret}
atomic_long_${name}(${params})
{
${retstmt}${atomic}_${name}(${argscast});
@@ -64,6 +64,7 @@ cat << EOF
#ifndef _ASM_GENERIC_ATOMIC_LONG_H
#define _ASM_GENERIC_ATOMIC_LONG_H
+#include <linux/compiler.h>
#include <asm/types.h>
#ifdef CONFIG_64BIT