Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5cd9a60c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-arm

parents 9aec247d e03eb527

arch/arm/mm/Kconfig

+4 −4
Original line number Diff line number Diff line
@@ -370,21 +370,21 @@ config CPU_BIG_ENDIAN 


config CPU_ICACHE_DISABLE

	bool "Disable I-Cache"

	depends on CPU_ARM920T || CPU_ARM922T || CPU_ARM925T || CPU_ARM926T || CPU_ARM1020

	depends on CPU_ARM920T || CPU_ARM922T || CPU_ARM925T || CPU_ARM926T || CPU_ARM1020 || CPU_V6

	help

	  Say Y here to disable the processor instruction cache. Unless

	  you have a reason not to or are unsure, say N.



config CPU_DCACHE_DISABLE

	bool "Disable D-Cache"

	depends on CPU_ARM920T || CPU_ARM922T || CPU_ARM925T || CPU_ARM926T || CPU_ARM1020

	depends on CPU_ARM920T || CPU_ARM922T || CPU_ARM925T || CPU_ARM926T || CPU_ARM1020 || CPU_V6

	help

	  Say Y here to disable the processor data cache. Unless

	  you have a reason not to or are unsure, say N.



config CPU_DCACHE_WRITETHROUGH

	bool "Force write through D-cache"

	depends on (CPU_ARM920T || CPU_ARM922T || CPU_ARM925T || CPU_ARM926T || CPU_ARM1020) && !CPU_DCACHE_DISABLE

	depends on (CPU_ARM920T || CPU_ARM922T || CPU_ARM925T || CPU_ARM926T || CPU_ARM1020 || CPU_V6) && !CPU_DCACHE_DISABLE

	default y if CPU_ARM925T

	help

	  Say Y here to use the data cache in writethrough mode. Unless you
@@ -399,7 +399,7 @@ config CPU_CACHE_ROUND_ROBIN 


config CPU_BPREDICT_DISABLE

	bool "Disable branch prediction"

	depends on CPU_ARM1020

	depends on CPU_ARM1020 || CPU_V6

	help

	  Say Y here to disable branch prediction.  If unsure, say N.