Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

+2 -12
-11
arch/m68k/Kconfig.cpu
··· 53 53 System-On-Chip devices (eg 68328, 68302, etc). It does not contain 54 54 a paging MMU. 55 55 56 - config MCPU32 57 - bool 58 - select CPU_HAS_NO_BITFIELDS 59 - select CPU_HAS_NO_CAS 60 - select CPU_HAS_NO_UNALIGNED 61 - select CPU_NO_EFFICIENT_FFS 62 - help 63 - The Freescale (was then Motorola) CPU32 is a CPU core that is 64 - based on the 68020 processor. For the most part it is used in 65 - System-On-Chip parts, and does not contain a paging MMU. 66 - 67 56 config M68020 68 57 bool "68020 support" 69 58 depends on MMU
+1
arch/m68k/Kconfig.machine
··· 203 203 config MEMORY_RESERVE 204 204 int "Memory reservation (MiB)" 205 205 depends on (UCSIMM || UCDIMM) 206 + default 0 206 207 help 207 208 Reserve certain memory regions on 68x328 based boards. 208 209
+1 -1
arch/m68k/include/asm/bitops.h
··· 451 451 * generic functions for those. 452 452 */ 453 453 #if (defined(__mcfisaaplus__) || defined(__mcfisac__)) && \ 454 - !defined(CONFIG_M68000) && !defined(CONFIG_MCPU32) 454 + !defined(CONFIG_M68000) 455 455 static inline unsigned long __ffs(unsigned long x) 456 456 { 457 457 __asm__ __volatile__ ("bitrev %0; ff1 %0"