Commit 6d76f6eb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'm68knommu-for-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu 

Pull m68knommu updates from Greg Ungerer:
 "Only two changes.

  One removes the now unused CONFIG_MCPU32 symbol. The other sets a
  default for the CONFIG_MEMORY_RESERVE config symbol (this aids
  scripting and other automation) so you don't interactively get asked
  for a value at configure time.

  Summary:

   - remove unused CONFIG_MCPU32 symbol

   - default CONFIG_MEMORY_RESERVE value (for scripting)"

* tag 'm68knommu-for-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68knommu: Remove MCPU32 config symbol
  m68k: set a default value for MEMORY_RESERVE
parents 600b18f8 6dbe88e9

arch/m68k/Kconfig.cpu

+0 −11
Original line number Diff line number Diff line
@@ -53,17 +53,6 @@ config M68000 
	  System-On-Chip devices (eg 68328, 68302, etc). It does not contain

	  a paging MMU.



config MCPU32

	bool

	select CPU_HAS_NO_BITFIELDS

	select CPU_HAS_NO_CAS

	select CPU_HAS_NO_UNALIGNED

	select CPU_NO_EFFICIENT_FFS

	help

	  The Freescale (was then Motorola) CPU32 is a CPU core that is

	  based on the 68020 processor. For the most part it is used in

	  System-On-Chip parts, and does not contain a paging MMU.



config M68020

	bool "68020 support"

	depends on MMU

arch/m68k/Kconfig.machine

+1 −0
Original line number Diff line number Diff line
@@ -203,6 +203,7 @@ config INIT_LCD 
config MEMORY_RESERVE

	int "Memory reservation (MiB)"

	depends on (UCSIMM || UCDIMM)

	default 0

	help

	  Reserve certain memory regions on 68x328 based boards.

arch/m68k/include/asm/bitops.h

+1 −1
Original line number Diff line number Diff line
@@ -451,7 +451,7 @@ static inline unsigned long ffz(unsigned long word) 
 *	generic functions for those.

 */

#if (defined(__mcfisaaplus__) || defined(__mcfisac__)) && \

	!defined(CONFIG_M68000) && !defined(CONFIG_MCPU32)

	!defined(CONFIG_M68000)

static inline unsigned long __ffs(unsigned long x)

{

	__asm__ __volatile__ ("bitrev %0; ff1 %0"