From: Guenter Roeck Date: Fri, 17 Sep 2021 04:38:37 +0000 (-0700) Subject: csky: bitops: Remove duplicate __clear_bit define X-Git-Tag: accepted/tizen/unified/20230118.172025~6180^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fb5d69a5cd7865a733c2c1f26e2e3b75f59ce00d;p=platform%2Fkernel%2Flinux-rpi.git csky: bitops: Remove duplicate __clear_bit define Building csky:allmodconfig results in the following build error. In file included from ./include/linux/bitops.h:33, from ./include/linux/log2.h:12, from kernel/bounds.c:13: ./arch/csky/include/asm/bitops.h:77: error: "__clear_bit" redefined Since commit 9248e52fec95 ("locking/atomic: simplify non-atomic wrappers"), __clear_bit is defined in include/asm-generic/bitops/non-atomic.h, and the define in the csky include file is no longer necessary or useful. Remove it. Fixes: 9248e52fec95 ("locking/atomic: simplify non-atomic wrappers") Signed-off-by: Guenter Roeck Signed-off-by: Guo Ren --- diff --git a/arch/csky/include/asm/bitops.h b/arch/csky/include/asm/bitops.h index 9181878..02b72a0 100644 --- a/arch/csky/include/asm/bitops.h +++ b/arch/csky/include/asm/bitops.h @@ -74,7 +74,6 @@ static __always_inline unsigned long __fls(unsigned long x) * bug fix, why only could use atomic!!!! */ #include -#define __clear_bit(nr, vaddr) clear_bit(nr, vaddr) #include #include