From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 25 Feb 2025 02:06:33 +0000 (+1100)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git
X-Git-Tag: next-20250225~65
X-Git-Url: https://gentwo.org/gitweb/?a=commitdiff_plain;h=ea4fb82b087c5d66a36677059f7456f8ce401bf6;p=linux%2F.git

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git

# Conflicts:
#	arch/riscv/include/asm/io.h
---

ea4fb82b087c5d66a36677059f7456f8ce401bf6
diff --cc arch/powerpc/Kconfig
index 3fdf7ba6c3b8,8a2a6e403eb1..9e117693dd9f
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -207,8 -207,10 +208,9 @@@ config PP
  	select GENERIC_IRQ_SHOW
  	select GENERIC_IRQ_SHOW_LEVEL
  	select GENERIC_PCI_IOMAP		if PCI
 -	select GENERIC_PTDUMP
  	select GENERIC_SMP_IDLE_THREAD
  	select GENERIC_TIME_VSYSCALL
+ 	select GENERIC_VDSO_DATA_STORE
  	select GENERIC_VDSO_TIME_NS
  	select HAS_IOPORT			if PCI
  	select HAVE_ARCH_AUDITSYSCALL
diff --cc arch/riscv/Kconfig
index 5aef2aa4103c,0409be768666..7c7bb9140df2
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@@ -112,7 -111,9 +112,8 @@@ config RISC
  	select GENERIC_IRQ_SHOW
  	select GENERIC_IRQ_SHOW_LEVEL
  	select GENERIC_LIB_DEVMEM_IS_ALLOWED
+ 	select GENERIC_PENDING_IRQ if SMP
  	select GENERIC_PCI_IOMAP
 -	select GENERIC_PTDUMP if MMU
  	select GENERIC_SCHED_CLOCK
  	select GENERIC_SMP_IDLE_THREAD
  	select GENERIC_TIME_VSYSCALL if MMU && 64BIT
diff --cc arch/riscv/include/asm/io.h
index 0536846db9b6,0257f4aa7ff4..a0e51840b9db
--- a/arch/riscv/include/asm/io.h
+++ b/arch/riscv/include/asm/io.h
@@@ -136,8 -136,8 +136,8 @@@ __io_writes_outs(outs, u64, q, __io_pbr
  #include <asm-generic/io.h>
  
  #ifdef CONFIG_MMU
- #define arch_memremap_wb(addr, size)	\
+ #define arch_memremap_wb(addr, size, flags)	\
 -	((__force void *)ioremap_prot((addr), (size), _PAGE_KERNEL))
 +	((__force void *)ioremap_prot((addr), (size), __pgprot(_PAGE_KERNEL)))
  #endif
  
  #endif /* _ASM_RISCV_IO_H */
diff --cc arch/s390/Kconfig
index d1d7be8ff5f7,7ed6f229250c..fdec67368f82
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@@ -164,8 -163,10 +164,9 @@@ config S39
  	select GENERIC_CPU_VULNERABILITIES
  	select GENERIC_ENTRY
  	select GENERIC_GETTIMEOFDAY
 -	select GENERIC_PTDUMP
  	select GENERIC_SMP_IDLE_THREAD
  	select GENERIC_TIME_VSYSCALL
+ 	select GENERIC_VDSO_DATA_STORE
  	select GENERIC_VDSO_TIME_NS
  	select GENERIC_IOREMAP if PCI
  	select HAVE_ALIGNED_STRUCT_PAGE
diff --cc include/linux/compiler.h
index 1fb582500736,aa7f0a9f6085..58543dbada9a
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@@ -210,28 -210,18 +210,38 @@@ void ftrace_likely_update(struct ftrace
  #define __must_be_cstr(p) \
  	__BUILD_BUG_ON_ZERO_MSG(__annotated(p, nonstring), "must be cstr (NUL-terminated)")
  
 +/*
 + * Use __typeof_unqual__() when available.
 + *
 + * XXX: Remove test for __CHECKER__ once
 + * sparse learns about __typeof_unqual__().
 + */
 +#if CC_HAS_TYPEOF_UNQUAL && !defined(__CHECKER__)
 +# define USE_TYPEOF_UNQUAL 1
 +#endif
 +
 +/*
 + * Define TYPEOF_UNQUAL() to use __typeof_unqual__() as typeof
 + * operator when available, to return an unqualified type of the exp.
 + */
 +#if defined(USE_TYPEOF_UNQUAL)
 +# define TYPEOF_UNQUAL(exp) __typeof_unqual__(exp)
 +#else
 +# define TYPEOF_UNQUAL(exp) __typeof__(exp)
 +#endif
 +
  #endif /* __KERNEL__ */
  
+ #if defined(CONFIG_CFI_CLANG) && !defined(__DISABLE_EXPORTS) && !defined(BUILD_VDSO)
+ /*
+  * Force a reference to the external symbol so the compiler generates
+  * __kcfi_typid.
+  */
+ #define KCFI_REFERENCE(sym) __ADDRESSABLE(sym)
+ #else
+ #define KCFI_REFERENCE(sym)
+ #endif
+ 
  /**
   * offset_to_ptr - convert a relative memory offset to an absolute pointer
   * @off:	the address of the 32-bit offset value