Merge tag 'asm-generic-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd...

Pull asm-generic cleanups from Arnd Bergmann:
 "A series from Baoquan He cleans up the asm-generic/io.h to remove the
  ioremap_uc() definition from everything except x86, which still needs
  it for pre-PAT systems. This series notably contains a patch from
  Jiaxun Yang that converts MIPS to use asm-generic/io.h like every
  other architecture does, enabling future cleanups.

  Some of my own patches fix -Wmissing-prototype warnings in
  architecture specific code across several architectures. This is now
  needed as the warning is enabled by default. There are still some
  remaining warnings in minor platforms, but the series should catch
  most of the widely used ones make them more consistent with one
  another.

  David McKay fixes a bug in __generic_cmpxchg_local() when this is used
  on 64-bit architectures. This could currently only affect parisc64 and
  sparc64.

  Additional cleanups address from Linus Walleij, Uwe Kleine-König,
  Thomas Huth, and Kefeng Wang help reduce unnecessary inconsistencies
  between architectures"

* tag 'asm-generic-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
  asm-generic: Fix 32 bit __generic_cmpxchg_local
  Hexagon: Make pfn accessors statics inlines
  ARC: mm: Make virt_to_pfn() a static inline
  mips: remove extraneous asm-generic/iomap.h include
  sparc: Use $(kecho) to announce kernel images being ready
  arm64: vdso32: Define BUILD_VDSO32_64 to correct prototypes
  csky: fix arch_jump_label_transform_static override
  arch: add do_page_fault prototypes
  arch: add missing prepare_ftrace_return() prototypes
  arch: vdso: consolidate gettime prototypes
  arch: include linux/cpu.h for trap_init() prototype
  arch: fix asm-offsets.c building with -Wmissing-prototypes
  arch: consolidate arch_irq_work_raise prototypes
  hexagon: Remove CONFIG_HEXAGON_ARCH_VERSION from uapi header
  asm/io: remove unnecessary xlate_dev_mem_ptr() and unxlate_dev_mem_ptr()
  mips: io: remove duplicated codes
  arch/*/io.h: remove ioremap_uc in some architectures
  mips: add <asm-generic/io.h> including

diff --cc arch/mips/include/asm/smp-ops.h
Simple merge

diff --cc arch/mips/include/asm/smp.h
Simple merge

diff --cc arch/mips/include/asm/traps.h
index 2c2b26f1e464b59caeccbd1d3e70f9afed8bf91f,d4d9f8a8fdea19285563c304dc3e82eababde35c..2a8a258730c902fa46334d7ea4a1f22d1405be28
--- 1/arch/mips/include/asm/traps.h
--- 2/arch/mips/include/asm/traps.h
+++ b/arch/mips/include/asm/traps.h
@@@ -39,28 -39,7 +39,30 @@@ extern char except_vec_nmi[]
        register_nmi_notifier(&fn##_nb);                                \
  })
  
 +asmlinkage void do_ade(struct pt_regs *regs);
 +asmlinkage void do_be(struct pt_regs *regs);
 +asmlinkage void do_ov(struct pt_regs *regs);
 +asmlinkage void do_fpe(struct pt_regs *regs, unsigned long fcr31);
 +asmlinkage void do_bp(struct pt_regs *regs);
 +asmlinkage void do_tr(struct pt_regs *regs);
 +asmlinkage void do_ri(struct pt_regs *regs);
 +asmlinkage void do_cpu(struct pt_regs *regs);
 +asmlinkage void do_msa_fpe(struct pt_regs *regs, unsigned int msacsr);
 +asmlinkage void do_msa(struct pt_regs *regs);
 +asmlinkage void do_mdmx(struct pt_regs *regs);
 +asmlinkage void do_watch(struct pt_regs *regs);
 +asmlinkage void do_mcheck(struct pt_regs *regs);
 +asmlinkage void do_mt(struct pt_regs *regs);
 +asmlinkage void do_dsp(struct pt_regs *regs);
 +asmlinkage void do_reserved(struct pt_regs *regs);
 +asmlinkage void do_ftlb(void);
 +asmlinkage void do_gsexc(struct pt_regs *regs, u32 diag1);
 +asmlinkage void do_daddi_ov(struct pt_regs *regs);
+ asmlinkage void do_page_fault(struct pt_regs *regs,
+       unsigned long write, unsigned long address);
  
 +asmlinkage void cache_parity_error(void);
 +asmlinkage void ejtag_exception_handler(struct pt_regs *regs);
 +asmlinkage void __noreturn nmi_exception_handler(struct pt_regs *regs);
 +
  #endif /* _ASM_TRAPS_H */

diff --cc arch/sparc/kernel/traps_64.c
Simple merge

diff --cc arch/x86/include/asm/vdso/gettimeofday.h
Simple merge