mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixes include: 

. remove unused CONFIG_MCPU32 symbol
 . default CONFIG_MEMORY_RESERVE value (for scripting)
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEmsfM6tQwfNjBOxr3TiQVqaG9L4AFAmGMV5IACgkQTiQVqaG9
 L4BmMw//R+P+vIG0Z+GN/00rKFZGnurH84DWPHljatrldZvTcQbByWZBNJxcIXmT
 CDj5J2En7w7RANoafzS6NC19YBPpdBpwXHMS4/0RIlgHqjTC7OcqTAxIGGTgkSvU
 yssamORhD6alypJkxy9WPn8Yx9gTSDu2qSvDCK5gdch/1Nf/8WIvnVfQ8U3+9fHw
 p+c0Xlon7lIUvsZk1FsthwS+ph7PPjtMfkVDGlTyuTkqnLqWGda2ceU4IlqVDNb/
 GCIV31JVhStjb5tPJnHzfk9Co9/8QTyNp9sJr+ikXhnKZzDOsrGmRLHW5mH2I/gB
 6iCXP8Xkw2FFEbGFTgG1/jI4d/qPlS3QizwHMum76mBvKVDQvGMLOh4ysbEKnHNJ
 ECfJJEfEYvXpckSYFPsasdG2JnLQaatLxTHfNvdoEDzNqNCmTmHVSuMpVseUc8gw
 yH0x1tYs+jbIVOu221mNx6e/1zwWV+EyvuKFFHBQUFbiYl9LmeJr1gNKzhuDx9Uk
 +6mePaVms9KbuabepS0rpsdaMt7vnLoEThah3cRJnhNKhnwRHd8jjNrSrFsf7upt
 28jOvuNmgCW1Zx3gqBG2bVxvTSjrhKHHAlrq87GtV83KrOKTOy+/w+hvgM1eduKg
 GxPy4PWi2VUJK0T65dXY071LQCBUg9WqxsPBp8NvE/lZXeN26ys=
 =Wg4t
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2021-11-11 14:22:05 -08:00
parent 600b18f88f 6dbe88e93c
commit 6d76f6eb46
3 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/m68k/Kconfig.cpu
View File

@ -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

1
arch/m68k/Kconfig.machine
View File

@ -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.

2
arch/m68k/include/asm/bitops.h
View File

@ -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"