From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 4 Aug 2022 22:27:20 +0000 (-0700)
Subject: Merge tag 'csky-for-linus-6.0-rc1' of https://github.com/c-sky/csky-linux
X-Git-Tag: baikal/mips/sdk6.1~5140
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=28ed3ca93243ee18546fd364a3d5de8aebc3b64e;p=kernel.git

Merge tag 'csky-for-linus-6.0-rc1' of https://github.com/c-sky/csky-linux

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
---

28ed3ca93243ee18546fd364a3d5de8aebc3b64e
diff --cc arch/csky/Kconfig
index f55ba1745f7b9,b23458b5c74f6..3cbc2dc62bafc
--- a/arch/csky/Kconfig
+++ b/arch/csky/Kconfig
@@@ -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