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

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

Linus Torvalds 5cd9a60c 9aec247d

+4 -4
unified split
+4 -4
arch/arm/mm/Kconfig
··· 370 370 371 371 config CPU_ICACHE_DISABLE 372 372 bool "Disable I-Cache" 373 - depends on CPU_ARM920T || CPU_ARM922T || CPU_ARM925T || CPU_ARM926T || CPU_ARM1020 373 + depends on CPU_ARM920T || CPU_ARM922T || CPU_ARM925T || CPU_ARM926T || CPU_ARM1020 || CPU_V6 374 374 help 375 375 Say Y here to disable the processor instruction cache. Unless 376 376 you have a reason not to or are unsure, say N. 377 377 378 378 config CPU_DCACHE_DISABLE 379 379 bool "Disable D-Cache" 380 - depends on CPU_ARM920T || CPU_ARM922T || CPU_ARM925T || CPU_ARM926T || CPU_ARM1020 380 + depends on CPU_ARM920T || CPU_ARM922T || CPU_ARM925T || CPU_ARM926T || CPU_ARM1020 || CPU_V6 381 381 help 382 382 Say Y here to disable the processor data cache. Unless 383 383 you have a reason not to or are unsure, say N. 384 384 385 385 config CPU_DCACHE_WRITETHROUGH 386 386 bool "Force write through D-cache" 387 - depends on (CPU_ARM920T || CPU_ARM922T || CPU_ARM925T || CPU_ARM926T || CPU_ARM1020) && !CPU_DCACHE_DISABLE 387 + depends on (CPU_ARM920T || CPU_ARM922T || CPU_ARM925T || CPU_ARM926T || CPU_ARM1020 || CPU_V6) && !CPU_DCACHE_DISABLE 388 388 default y if CPU_ARM925T 389 389 help 390 390 Say Y here to use the data cache in writethrough mode. Unless you ··· 399 399 400 400 config CPU_BPREDICT_DISABLE 401 401 bool "Disable branch prediction" 402 - depends on CPU_ARM1020 402 + depends on CPU_ARM1020 || CPU_V6 403 403 help 404 404 Say Y here to disable branch prediction. If unsure, say N. 405 405