From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 15 Mar 2024 19:47:21 +0000 (-0700)
Subject: Merge tag 'sparc-for-6.9-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/alars... 
X-Git-Tag: Ubuntu-6.11.0-9.9~1914
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=8a2fbffcbfcb60378626e5d4144a6ff43f3b6776;p=mirror_ubuntu-kernels.git

Merge tag 'sparc-for-6.9-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc

Pull sparc updates from Andreas Larsson:

 - Fix missing prototype warnings in various places, including switching
   to using generic cmpdi2/ucmpdi2 and parport.h and stop selecting
   unneeded GENERIC_ISA_DMA.

 - Reduce duplicate code by using shared font data, with dependency
   fixup in separate commit touching lib/fonts.

 - Convert sbus drives to use remove callbacks returning void

 - Fix return values of __setup handlers

 - Section mismatch fix for grpci pci drivers

 - Make the vio bus type constant

 - Kconfig cleanups and fixes

 - Typo fixes

* tag 'sparc-for-6.9-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc:
  lib/fonts: Allow Sparc console 8x16 font for sparc64 early boot text console
  sbus: uctrl: Convert to platform remove callback returning void
  sbus: flash: Convert to platform remove callback returning void
  sbus: envctrl: Convert to platform remove callback returning void
  sbus: display7seg: Convert to platform remove callback returning void
  sbus: bbc_i2c: Convert to platform remove callback returning void
  sbus: Add prototype for bbc_envctrl_init and bbc_envctrl_cleanup to header
  sparc32: Fix section mismatch in leon_pci_grpci
  sparc32: Fix parport build with sparc32
  sparc32: Do not select GENERIC_ISA_DMA
  mtd: maps: sun_uflash: Declare uflash_devinit static
  sparc32: Fix build with trapbase
  sparc32: Use generic cmpdi2/ucmpdi2 variants
  sparc: select FRAME_POINTER instead of redefining it
  sparc: vDSO: fix return value of __setup handler
  sparc64: NMI watchdog: fix return value of __setup handler
  sparc: vio: make vio_bus_type const
  sparc: Fix typos
  sparc: Use shared font data
  sparc: remove obsolete config ARCH_ATU
---

8a2fbffcbfcb60378626e5d4144a6ff43f3b6776
diff --cc arch/sparc/Kconfig
index 02c8fd18810c,d08a5662ea60..11bf9d312318
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@@ -58,8 -57,9 +58,10 @@@ config SPARC3
  	select CLZ_TAB
  	select DMA_DIRECT_REMAP
  	select GENERIC_ATOMIC64
+ 	select GENERIC_LIB_CMPDI2
+ 	select GENERIC_LIB_UCMPDI2
  	select HAVE_UID16
 +	select HAVE_PAGE_SIZE_4KB
  	select LOCK_MM_AND_FIND_VMA
  	select OLD_SIGACTION
  	select ZONE_DMA