X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=arch%2Fmips%2FKconfig;fp=arch%2Fmips%2FKconfig;h=cc8e2b1032a540502ec6d4e937636e41e3c16f6e;hb=5c6bd5de3c2e5bc8a17451e281ed2613375a7fd5;hp=2f7c050e8cdeb4fa42865940446acb03ba4f4209;hpb=05d013a0366d50f4f0dbebf8c1b22b42020bf49a;p=linux-2.6-microblaze.git

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 2f7c050e8cde..cc8e2b1032a5 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -45,6 +45,7 @@ config MIPS
 	select HAVE_ARCH_SECCOMP_FILTER
 	select HAVE_ARCH_TRACEHOOK
 	select HAVE_ARCH_TRANSPARENT_HUGEPAGE if CPU_SUPPORTS_HUGEPAGES
+	select HAVE_ASM_MODVERSIONS
 	select HAVE_EBPF_JIT if (!CPU_MICROMIPS)
 	select HAVE_CONTEXT_TRACKING
 	select HAVE_COPY_THREAD_TLS
@@ -1123,7 +1124,14 @@ config DMA_PERDEV_COHERENT
 
 config DMA_NONCOHERENT
 	bool
-	select ARCH_HAS_DMA_MMAP_PGPROT
+	#
+	# MIPS allows mixing "slightly different" Cacheability and Coherency
+	# Attribute bits.  It is believed that the uncached access through
+	# KSEG1 and the implementation specific "uncached accelerated" used
+	# by pgprot_writcombine can be mixed, and the latter sometimes provides
+	# significant advantages.
+	#
+	select ARCH_HAS_DMA_WRITE_COMBINE
 	select ARCH_HAS_SYNC_DMA_FOR_DEVICE
 	select ARCH_HAS_UNCACHED_SEGMENT
 	select NEED_DMA_MAP_STATE