diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-10-16 09:12:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-10-16 09:12:18 -0700 |
| commit | c13f946bf1ef0eef49748b1824a0bdfb3487fe8c (patch) | |
| tree | 9183f9a880386caa7264789462aba4413b2bdd59 /arch/csky/include/asm/bitops.h | |
| parent | 5fd01b7263999c09f0596f5efd726b681474283c (diff) | |
| parent | e21e52ad1e0126e2a5e2013084ac3f47cf1e887a (diff) | |
Merge tag 'csky-for-linus-5.15-rc6' of git://github.com/c-sky/csky-linux
Pull csky fixes from Guo Ren:
"Only 5 fixups:
- Make HAVE_TCM depend on !COMPILE_TEST
- bitops: Remove duplicate __clear_bit define
- Select ARCH_WANT_FRAME_POINTERS only if compiler supports it
- Fixup regs.sr broken in ptrace
- don't let sigreturn play with priveleged bits of status register"
* tag 'csky-for-linus-5.15-rc6' of git://github.com/c-sky/csky-linux:
csky: Make HAVE_TCM depend on !COMPILE_TEST
csky: bitops: Remove duplicate __clear_bit define
csky: Select ARCH_WANT_FRAME_POINTERS only if compiler supports it
csky: Fixup regs.sr broken in ptrace
csky: don't let sigreturn play with priveleged bits of status register
Diffstat (limited to 'arch/csky/include/asm/bitops.h')
| -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> |