From: Octavian Purdila <tavi.purdila@xxxxxxxxx> With CONFIG_64BIT enabled, atomic64 via CONFIG_GENERIC_ATOMIC64 options are not compiled due to type conflict of atomic64_t defined in linux/type.h. This commit fixes the issue and allow using generic atomic64 ops. Signed-off-by: Octavian Purdila <tavi.purdila@xxxxxxxxx> --- include/asm-generic/atomic64.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/asm-generic/atomic64.h b/include/asm-generic/atomic64.h index 370f01d4450f..9b15847baae5 100644 --- a/include/asm-generic/atomic64.h +++ b/include/asm-generic/atomic64.h @@ -9,9 +9,11 @@ #define _ASM_GENERIC_ATOMIC64_H #include <linux/types.h> +#ifndef CONFIG_64BIT typedef struct { s64 counter; } atomic64_t; +#endif #define ATOMIC64_INIT(i) { (i) } -- 2.20.1 (Apple Git-117)