From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 16 Sep 2024 04:32:08 +0000 (+0200)
Subject: Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux
X-Git-Tag: v6.12-rc1~230
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/1636f57c7841101af8bd4872aafb79cfc74bf389?hp=-c

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux

Pull ARM updates from Russell King:

 - clean up TTBCR magic numbers and use u32 for this register

 - fix clang issue in VFP code leading to kernel oops, caused by
   compiler instruction scheduling.

 - switch 32-bit Arm to use GENERIC_CPU_DEVICES and use the
   arch_cpu_is_hotpluggable() hook.

 - pass struct device to arm_iommu_create_mapping() and move over to use
   iommu_paging_domain_alloc() rather than iommu_domain_alloc()

 - make amba_bustype constant

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux:
  ARM: 9418/1: dma-mapping: Use iommu_paging_domain_alloc()
  ARM: 9417/1: dma-mapping: Pass device to arm_iommu_create_mapping()
  ARM: 9416/1: amba: make amba_bustype constant
  ARM: 9412/1: Convert to arch_cpu_is_hotpluggable()
  ARM: 9411/1: Switch over to GENERIC_CPU_DEVICES using arch_register_cpu()
  ARM: 9410/1: vfp: Use asm volatile in fmrx/fmxr macros
  ARM: 9409/1: mmu: Do not use magic number for TTBCR settings
---

1636f57c7841101af8bd4872aafb79cfc74bf389
diff --combined arch/arm/Kconfig
index 173159e93c99,bd2b91f6b6cf..0ec034933cae
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -64,6 -64,7 +64,7 @@@ config AR
  	select GENERIC_CLOCKEVENTS_BROADCAST if SMP
  	select GENERIC_IRQ_IPI if SMP
  	select GENERIC_CPU_AUTOPROBE
+ 	select GENERIC_CPU_DEVICES
  	select GENERIC_EARLY_IOREMAP
  	select GENERIC_IDLE_POLL_SETUP
  	select GENERIC_IRQ_MULTI_HANDLER
@@@ -117,7 -118,7 +118,7 @@@
  	select HAVE_KERNEL_XZ
  	select HAVE_KPROBES if !XIP_KERNEL && !CPU_ENDIAN_BE32 && !CPU_V7M
  	select HAVE_KRETPROBES if HAVE_KPROBES
 -	select HAVE_LD_DEAD_CODE_DATA_ELIMINATION
 +	select HAVE_LD_DEAD_CODE_DATA_ELIMINATION if (LD_VERSION >= 23600 || LD_IS_LLD)
  	select HAVE_MOD_ARCH_SPECIFIC
  	select HAVE_NMI
  	select HAVE_OPTPROBES if !THUMB2_KERNEL