Skip to content

Commit

Permalink
csky: bitops: Remove duplicate __clear_bit define
Browse files Browse the repository at this point in the history
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 9248e52 ("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: 9248e52 ("locking/atomic: simplify non-atomic wrappers")
Signed-off-by: Guenter Roeck <[email protected]>
Signed-off-by: Guo Ren <[email protected]>
  • Loading branch information
groeck authored and guoren83 committed Oct 15, 2021
1 parent aeba0b8 commit fb5d69a
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion arch/csky/include/asm/bitops.h
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit fb5d69a

Please sign in to comment.