diff options
| author | Guenter Roeck <linux@roeck-us.net> | 2021-09-16 21:38:37 -0700 |
|---|---|---|
| committer | Guo Ren <guoren@linux.alibaba.com> | 2021-10-16 07:20:12 +0800 |
| commit | fb5d69a5cd7865a733c2c1f26e2e3b75f59ce00d (patch) | |
| tree | 5788d35742bc6975dce107aa080aea26bc7237c1 | |
| parent | aeba0b84dd07a9e6b362395f5ad47091249db13d (diff) | |
| download | linux-rpi-fb5d69a5cd7865a733c2c1f26e2e3b75f59ce00d.tar.gz linux-rpi-fb5d69a5cd7865a733c2c1f26e2e3b75f59ce00d.tar.bz2 linux-rpi-fb5d69a5cd7865a733c2c1f26e2e3b75f59ce00d.zip | |
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 <linux@roeck-us.net>
Signed-off-by: Guo Ren <guoren@kernel.org>
| -rw-r--r-- | arch/csky/include/asm/bitops.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/csky/include/asm/bitops.h b/arch/csky/include/asm/bitops.h index 91818787d860..02b72a000767 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 <asm-generic/bitops/non-atomic.h> -#define __clear_bit(nr, vaddr) clear_bit(nr, vaddr) #include <asm-generic/bitops/le.h> #include <asm-generic/bitops/ext2-atomic.h> |