From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 2 Apr 2025 19:15:01 +0000 (-0700)
Subject: Merge tag 'loongarch-6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuaca... 
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=1c241cba196decd73b6959e851bfb71d0a1c1767;p=linux-2.6-microblaze.git

Merge tag 'loongarch-6.15' of git://git./linux/kernel/git/chenhuacai/linux-loongson

Pull LoongArch updates from Huacai Chen:

 - Always select HAVE_VIRT_CPU_ACCOUNTING_GEN

 - Enable UBSAN (Undefined Behavior Sanitizer)

 - Increase MAX_IO_PICS up to 8

 - Increase ARCH_DMA_MINALIGN up to 16

 - Fix and improve BPF JIT

 - Fix and improve vDSO implementation

 - Update the default config file

 - Some bug fixes and other small changes

* tag 'loongarch-6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson:
  LoongArch: Update Loongson-3 default config file
  LoongArch: vDSO: Make use of the t8 register for vgetrandom-chacha
  LoongArch: vDSO: Remove --hash-style=sysv
  LoongArch: BPF: Don't override subprog's return value
  LoongArch: BPF: Use move_addr() for BPF_PSEUDO_FUNC
  LoongArch: BPF: Fix off-by-one error in build_prologue()
  LoongArch: Rework the arch_kgdb_breakpoint() implementation
  LoongArch: Fix device node refcount leak in fdt_cpu_clk_init()
  LoongArch: Increase ARCH_DMA_MINALIGN up to 16
  LoongArch: Increase MAX_IO_PICS up to 8
  LoongArch: Fix help text of CMDLINE_EXTEND in Kconfig
  LoongArch: Enable UBSAN (Undefined Behavior Sanitizer)
  LoongArch: Always select HAVE_VIRT_CPU_ACCOUNTING_GEN
  rust: Fix enabling Rust and building with GCC for LoongArch
---

1c241cba196decd73b6959e851bfb71d0a1c1767
diff --cc arch/loongarch/Kconfig
index 687502917ae2,02fc28020ddd..067c0b994648
--- a/arch/loongarch/Kconfig
+++ b/arch/loongarch/Kconfig
@@@ -30,7 -30,7 +30,8 @@@ config LOONGARC
  	select ARCH_HAS_SET_MEMORY
  	select ARCH_HAS_SET_DIRECT_MAP
  	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
+ 	select ARCH_HAS_UBSAN
 +	select ARCH_HAS_VDSO_ARCH_DATA
  	select ARCH_INLINE_READ_LOCK if !PREEMPTION
  	select ARCH_INLINE_READ_LOCK_BH if !PREEMPTION
  	select ARCH_INLINE_READ_LOCK_IRQ if !PREEMPTION
diff --cc rust/Makefile
index b9cc810764e9,2c57c624fe7d..2a8342e9c5b5
--- a/rust/Makefile
+++ b/rust/Makefile
@@@ -274,7 -247,7 +275,8 @@@ bindgen_skip_c_flags := -mno-fp-ret-in-
  # Derived from `scripts/Makefile.clang`.
  BINDGEN_TARGET_x86	:= x86_64-linux-gnu
  BINDGEN_TARGET_arm64	:= aarch64-linux-gnu
+ BINDGEN_TARGET_loongarch	:= loongarch64-linux-gnusf
 +BINDGEN_TARGET_um	:= $(BINDGEN_TARGET_$(SUBARCH))
  BINDGEN_TARGET		:= $(BINDGEN_TARGET_$(SRCARCH))
  
  # All warnings are inhibited since GCC builds are very experimental,