]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
Merge tag 'loongarch-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 Mar 2024 17:22:45 +0000 (10:22 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 Mar 2024 17:22:45 +0000 (10:22 -0700)
Pull LoongArch updates from Huacai Chen:

 - Add objtool support for LoongArch

 - Add ORC stack unwinder support for LoongArch

 - Add kernel livepatching support for LoongArch

 - Select ARCH_HAS_CURRENT_STACK_POINTER in Kconfig

 - Select HAVE_ARCH_USERFAULTFD_MINOR in Kconfig

 - Some bug fixes and other small changes

* tag 'loongarch-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson:
  LoongArch/crypto: Clean up useless assignment operations
  LoongArch: Define the __io_aw() hook as mmiowb()
  LoongArch: Remove superfluous flush_dcache_page() definition
  LoongArch: Move {dmw,tlb}_virt_to_page() definition to page.h
  LoongArch: Change __my_cpu_offset definition to avoid mis-optimization
  LoongArch: Select HAVE_ARCH_USERFAULTFD_MINOR in Kconfig
  LoongArch: Select ARCH_HAS_CURRENT_STACK_POINTER in Kconfig
  LoongArch: Add kernel livepatching support
  LoongArch: Add ORC stack unwinder support
  objtool: Check local label in read_unwind_hints()
  objtool: Check local label in add_dead_ends()
  objtool/LoongArch: Enable orc to be built
  objtool/x86: Separate arch-specific and generic parts
  objtool/LoongArch: Implement instruction decoder
  objtool/LoongArch: Enable objtool to be built

1  2 
arch/loongarch/Kconfig
arch/loongarch/Makefile
arch/loongarch/include/asm/page.h
arch/loongarch/kernel/setup.c
arch/loongarch/kvm/switch.S
include/linux/compiler.h
scripts/Makefile
tools/objtool/check.c

index c139d0d728029e200899c857c9cbb50e45c9d7c2,526a88598fbfc514c8b3be295d9eb20b6fccadca..a5f300ec6f2808b8890ebc27d0de8a918eaa8636
@@@ -133,8 -135,11 +135,10 @@@ config LOONGARC
        select HAVE_KPROBES
        select HAVE_KPROBES_ON_FTRACE
        select HAVE_KRETPROBES
 -      select HAVE_KVM
+       select HAVE_LIVEPATCH
        select HAVE_MOD_ARCH_SPECIFIC
        select HAVE_NMI
+       select HAVE_OBJTOOL if AS_HAS_EXPLICIT_RELOCS
        select HAVE_PCI
        select HAVE_PERF_EVENTS
        select HAVE_PERF_REGS
index fa4fb09909aeb1c7ebe640329936cd095e8224c8,e3bc02fb7fdcce1d3224371b73c0578adb7dd827..df6caf79537a9d884aa97161a32840782147460e
@@@ -82,7 -92,15 +92,16 @@@ KBUILD_AFLAGS_MODULE                += -Wa,-mla-globa
  KBUILD_CFLAGS_MODULE          += -fplt -Wa,-mla-global-with-abs,-mla-local-with-abs
  endif
  
+ KBUILD_AFLAGS                 += $(call cc-option,-mno-relax) $(call cc-option,-Wa$(comma)-mno-relax)
+ KBUILD_CFLAGS                 += $(call cc-option,-mno-relax) $(call cc-option,-Wa$(comma)-mno-relax)
+ KBUILD_AFLAGS                 += $(call cc-option,-mthin-add-sub) $(call cc-option,-Wa$(comma)-mthin-add-sub)
+ KBUILD_CFLAGS                 += $(call cc-option,-mthin-add-sub) $(call cc-option,-Wa$(comma)-mthin-add-sub)
+ ifdef CONFIG_OBJTOOL
+ KBUILD_CFLAGS                 += -fno-jump-tables
+ endif
 +KBUILD_RUSTFLAGS                      += --target=$(objtree)/scripts/target.json
  KBUILD_RUSTFLAGS_MODULE               += -Crelocation-model=pic
  
  ifeq ($(CONFIG_RELOCATABLE),y)
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge