diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2020-05-04 15:25:30 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2020-05-04 15:25:30 +0200 |
| commit | a8644aebec1152b992d5d54a05a538d338262944 (patch) | |
| tree | 5c0084fbcaf77545497d0ca92bc033693b185653 /scripts/atomic/fallbacks/fetch_add_unless | |
| parent | 9e96e646e6f890308110cb7c81f200f5211cf082 (diff) | |
| parent | 3b02a051d25d9600e9d403ad3043aed7de00160e (diff) | |
Merge branch 'locking/kcsan' into x86/entryentry-base
Pull the pending KCSAN changes as the required changes vs. atomics to fixup
INT3 interfere with the KCSAN modifications of atomics.
Diffstat (limited to 'scripts/atomic/fallbacks/fetch_add_unless')
| -rwxr-xr-x | scripts/atomic/fallbacks/fetch_add_unless | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/atomic/fallbacks/fetch_add_unless b/scripts/atomic/fallbacks/fetch_add_unless index d2c091db7eae..fffbc0d16fdf 100755 --- a/scripts/atomic/fallbacks/fetch_add_unless +++ b/scripts/atomic/fallbacks/fetch_add_unless @@ -8,7 +8,7 @@ cat << EOF * Atomically adds @a to @v, so long as @v was not already @u. * Returns original value of @v */ -static inline ${int} +static __always_inline ${int} ${atomic}_fetch_add_unless(${atomic}_t *v, ${int} a, ${int} u) { ${int} c = ${atomic}_read(v); |