Commit 833ae40b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu 

Pull m68knommu fixes from Greg Ungerer:
 "Just a small collection of cleanups and fixes this time, no big
  changes.  The most interresting are to make the m68k and m68knommu
  consistently use CONFIG_IOMAP, clean out some unused board config
  options and flush the cache on signal stack creation"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k: remove 16 unused boards in Kconfig.machine
  m68k: define 'VM_DATA_DEFAULT_FLAGS' no matter whether has 'NOMMU' or not
  m68knommu: user generic iomap to support ioread*/iowrite*
  m68k/coldfire: flush cache when creating the signal stack frame
  m68knommu: Mark functions only called from setup_arch() __init
parents 20e029d7 c065edde

arch/m68k/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ config M68K 
	select VIRT_TO_BUS

	select ARCH_HAVE_NMI_SAFE_CMPXCHG if RMW_INSNS

	select GENERIC_CPU_DEVICES

	select GENERIC_IOMAP

	select GENERIC_STRNCPY_FROM_USER if MMU

	select GENERIC_STRNLEN_USER if MMU

	select FPU if MMU
@@ -72,7 +73,6 @@ source "kernel/Kconfig.freezer" 
config MMU

	bool "MMU-based Paged Memory Management Support"

	default y

	select GENERIC_IOMAP

	help

	  Select if you want MMU-based virtualised addressing space

	  support by paged memory management. If unsure, say 'Y'.

arch/m68k/Kconfig.machine

+0 −134
Original line number Diff line number Diff line
@@ -150,18 +150,6 @@ config XCOPILOT_BUGS 
	help

	  Support the bugs of Xcopilot.



config UC5272

	bool "Arcturus Networks uC5272 dimm board support"

	depends on M5272

	help

	  Support for the Arcturus Networks uC5272 dimm board.



config UC5282

	bool "Arcturus Networks uC5282 board support"

	depends on M528x

	help

	  Support for the Arcturus Networks uC5282 dimm board.



config UCSIMM

	bool "uCsimm module support"

	depends on M68EZ328
@@ -205,23 +193,15 @@ config UCQUICC 
	help

	  Support for the Lineo uCquicc board.



config ARNEWSH

	bool



config ARN5206

	bool "Arnewsh 5206 board support"

	depends on M5206

	select ARNEWSH

	help

	  Support for the Arnewsh 5206 board.



config FREESCALE

	bool



config M5206eC3

	bool "Motorola M5206eC3 board support"

	depends on M5206e

	select FREESCALE

	help

	  Support for the Motorola M5206eC3 board.
@@ -231,88 +211,24 @@ config ELITE 
	help

	  Support for the Motorola M5206eLITE board.



config M5208EVB

	bool "Freescale M5208EVB board support"

	depends on M520x

	select FREESCALE

	help

	  Support for the Freescale Coldfire M5208EVB.



config M5235EVB

	bool "Freescale M5235EVB support"

	depends on M523x

	select FREESCALE

	help

	  Support for the Freescale M5235EVB board.



config M5249C3

	bool "Motorola M5249C3 board support"

	depends on M5249

	select FREESCALE

	help

	  Support for the Motorola M5249C3 board.



config M5271EVB

	bool "Freescale (Motorola) M5271EVB board support"

	depends on M5271

	select FREESCALE

	help

	  Support for the Freescale (Motorola) M5271EVB board.



config M5275EVB

	bool "Freescale (Motorola) M5275EVB board support"

	depends on M5275

	select FREESCALE

	help

	  Support for the Freescale (Motorola) M5275EVB board.



config M5272C3

	bool "Motorola M5272C3 board support"

	depends on M5272

	select FREESCALE

	help

	  Support for the Motorola M5272C3 board.



config senTec

	bool



config COBRA5272

	bool "senTec COBRA5272 board support"

	depends on M5272

	select senTec

	help

	  Support for the senTec COBRA5272 board.



config AVNET

	bool



config AVNET5282

	bool "Avnet 5282 board support"

	depends on M528x

	select AVNET

	help

	  Support for the Avnet 5282 board.



config M5282EVB

	bool "Motorola M5282EVB board support"

	depends on M528x

	select FREESCALE

	help

	  Support for the Motorola M5282EVB board.



config COBRA5282

	bool "senTec COBRA5282 board support"

	depends on M528x

	select senTec

	help

	  Support for the senTec COBRA5282 board.



config SOM5282EM

	bool "EMAC.Inc SOM5282EM board support"

	depends on M528x

	help

	  Support for the EMAC.Inc SOM5282EM module.



config WILDFIRE

	bool "Intec Automation Inc. WildFire board support"

	depends on M528x
@@ -328,14 +244,12 @@ config WILDFIREMOD 
config ARN5307

	bool "Arnewsh 5307 board support"

	depends on M5307

	select ARNEWSH

	help

	  Support for the Arnewsh 5307 board.



config M5307C3

	bool "Motorola M5307C3 board support"

	depends on M5307

	select FREESCALE

	help

	  Support for the Motorola M5307C3 board.
@@ -345,30 +259,9 @@ config SECUREEDGEMP3 
	help

	  Support for the SnapGear SecureEdge/MP3 platform.



config M5329EVB

	bool "Freescale (Motorola) M5329EVB board support"

	depends on M532x

	select FREESCALE

	help

	  Support for the Freescale (Motorola) M5329EVB board.



config COBRA5329

	bool "senTec COBRA5329 board support"

	depends on M532x

	help

	  Support for the senTec COBRA5329 board.



config M5373EVB

	bool "Freescale M5373EVB board support"

	depends on M537x

	select FREESCALE

	help

	  Support for the Freescale M5373EVB board.



config M5407C3

	bool "Motorola M5407C3 board support"

	depends on M5407

	select FREESCALE

	help

	  Support for the Motorola M5407C3 board.
@@ -402,39 +295,12 @@ config NETtel 
	help

	  Support for the SnapGear NETtel/SecureEdge/SnapGear boards.



config SNAPGEAR

	bool "SnapGear router board support"

	depends on NETtel

	help

	  Special additional support for SnapGear router boards.



config SNEHA

	bool



config CPU16B

	bool "Sneha Technologies S.L. Sarasvati board support"

	depends on M5272

	select SNEHA

	help

	  Support for the SNEHA CPU16B board.



config MOD5272

	bool "Netburner MOD-5272 board support"

	depends on M5272

	help

	  Support for the Netburner MOD-5272 board.



config SAVANT

	bool



config SAVANTrosie1

	bool "Savant Rosie1 board support"

	depends on M523x

	select SAVANT

	help

	  Support for the Savant Rosie1 board.





if !MMU || COLDFIRE



comment "Machine Options"

arch/m68k/include/asm/io_no.h

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#ifdef __KERNEL__



#include <asm/virtconvert.h>

#include <asm-generic/iomap.h>



/*

 * These are for ISA/PCI shared memory _only_ and should never be used

arch/m68k/include/asm/page.h

+3 −0
Original line number Diff line number Diff line
@@ -48,6 +48,9 @@ extern unsigned long _ramend; 
#include <asm/page_no.h>

#endif



#define VM_DATA_DEFAULT_FLAGS	(VM_READ | VM_WRITE | VM_EXEC | \

				 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)



#include <asm-generic/getorder.h>



#endif /* _M68K_PAGE_H */

arch/m68k/include/asm/page_mm.h

+0 −3
Original line number Diff line number Diff line
@@ -173,7 +173,4 @@ static inline __attribute_const__ int __virt_to_node_shift(void) 


#endif /* __ASSEMBLY__ */



#define VM_DATA_DEFAULT_FLAGS	(VM_READ | VM_WRITE | VM_EXEC | \

				 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)



#endif /* _M68K_PAGE_MM_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE