diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-14 11:11:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-14 11:11:39 -0700 |
| commit | e9f8f48bcac6f6dd37ad89ad63d1d1a497332313 (patch) | |
| tree | 543337ad6028bd0aba62be05b4068be115a9ab64 /arch | |
| parent | d8bfb96a2e3c42f91a9944a19638c043cb86dd8f (diff) | |
| parent | 35d04077ad96ed33ceea2501f5a4f1eacda77218 (diff) | |
| download | linux-e9f8f48bcac6f6dd37ad89ad63d1d1a497332313.tar.gz linux-e9f8f48bcac6f6dd37ad89ad63d1d1a497332313.tar.bz2 linux-e9f8f48bcac6f6dd37ad89ad63d1d1a497332313.zip | |
Merge tag 'metag-for-v4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag
Pull metag architecture fix from James Hogan:
"A simple build fix for irqsoff atomics which has started hitting
meta1_defconfig during the 4.9 merge window"
* tag 'metag-for-v4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag:
metag: Only define atomic_dec_if_positive conditionally
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/metag/include/asm/atomic.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/metag/include/asm/atomic.h b/arch/metag/include/asm/atomic.h index 470e365f04ea..8ff0a70865f6 100644 --- a/arch/metag/include/asm/atomic.h +++ b/arch/metag/include/asm/atomic.h @@ -39,11 +39,10 @@ #define atomic_dec(v) atomic_sub(1, (v)) #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) +#define atomic_dec_if_positive(v) atomic_sub_if_positive(1, v) #endif -#define atomic_dec_if_positive(v) atomic_sub_if_positive(1, v) - #include <asm-generic/atomic64.h> #endif /* __ASM_METAG_ATOMIC_H */ |