Commit e9f8f48b authored Oct 14, 2016 by Linus Torvalds

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

parents d8bfb96a 35d04077

arch/metag/include/asm/atomic.h

+1 −2

Original line number	Diff line number	Diff line
		@@ -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 */