]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Merge tag 'csky-for-linus-6.0-rc1' of https://github.com/c-sky/csky-linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 4 Aug 2022 22:27:20 +0000 (15:27 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 4 Aug 2022 22:27:20 +0000 (15:27 -0700)
Pull csky updates from Guo Ren:

 - Add jump-label implementation

 - Add qspinlock support

 - Enable ARCH_INLINE_READ*/WRITE*/SPIN*

 - Some fixups and a coding convention

* tag 'csky-for-linus-6.0-rc1' of https://github.com/c-sky/csky-linux:
  csky: abiv1: Fixup compile error
  csky: cmpxchg: Coding convention for BUILD_BUG()
  csky: Enable ARCH_INLINE_READ*/WRITE*/SPIN*
  csky: Add qspinlock support
  csky: Add jump-label implementation
  csky: Move HEAD_TEXT_SECTION out of __init_begin-end
  csky: Correct position of _stext
  csky: Use the bitmap API to allocate bitmaps
  csky/kprobe: reclaim insn_slot on kprobe unregistration

1  2 
arch/csky/Kconfig

index f55ba1745f7b961913cd785f0a7d9f3ff9ea9c5c,b23458b5c74f6d49de73fbd91dcb9e5f2eeb2f1a..3cbc2dc62bafc2fa7805e79fc2316dee50be05ae
@@@ -40,9 -67,11 +67,11 @@@ config CSK
        select GX6605S_TIMER if CPU_CK610
        select HAVE_ARCH_TRACEHOOK
        select HAVE_ARCH_AUDITSYSCALL
+       select HAVE_ARCH_JUMP_LABEL if !CPU_CK610
+       select HAVE_ARCH_JUMP_LABEL_RELATIVE
        select HAVE_ARCH_MMAP_RND_BITS
        select HAVE_ARCH_SECCOMP_FILTER
 -      select HAVE_CONTEXT_TRACKING
 +      select HAVE_CONTEXT_TRACKING_USER
        select HAVE_VIRT_CPU_ACCOUNTING_GEN
        select HAVE_DEBUG_BUGVERBOSE
        select HAVE_DEBUG_KMEMLEAK