Commit c8f0fef2 authored Oct 07, 2016 by Guenter Roeck Committed by Greg Kroah-Hartman Oct 28, 2016

metag: Only define atomic_dec_if_positive conditionally



commit 35d04077ad96ed33ceea2501f5a4f1eacda77218 upstream.

The definition of atomic_dec_if_positive() assumes that
atomic_sub_if_positive() exists, which is only the case if
metag specific atomics are used. This results in the following
build error when trying to build metag1_defconfig.

kernel/ucount.c: In function 'dec_ucount':
kernel/ucount.c:211: error:
	implicit declaration of function 'atomic_sub_if_positive'

Moving the definition of atomic_dec_if_positive() into the metag
conditional code fixes the problem.

Fixes: 6006c0d8 ("metag: Atomics, locks and bitops")
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: James Hogan <james.hogan@imgtec.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent bffff930

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 */