asm-generic: reverse GENERIC_{STRNCPY_FROM,STRNLEN}_USER symbols

[linux-2.6-microblaze.git] / arch / um / Kconfig

diff --git a/arch/um/Kconfig b/arch/um/Kconfig
index 57cfd9a..77e66d3 100644 (file)
--- a/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@ -7,6 +7,8 @@ config UML
        default y
        select ARCH_EPHEMERAL_INODES
        select ARCH_HAS_KCOV
+       select ARCH_HAS_STRNCPY_FROM_USER
+       select ARCH_HAS_STRNLEN_USER
        select ARCH_NO_PREEMPT
        select HAVE_ARCH_AUDITSYSCALL
        select HAVE_ARCH_SECCOMP_FILTER
@@ -15,7 +17,7 @@ config UML
        select HAVE_FUTEX_CMPXCHG if FUTEX
        select HAVE_DEBUG_KMEMLEAK
        select HAVE_DEBUG_BUGVERBOSE
-       select NO_DMA
+       select NO_DMA if !UML_DMA_EMULATION
        select GENERIC_IRQ_SHOW
        select GENERIC_CPU_DEVICES
        select HAVE_GCC_PLUGINS
@@ -26,7 +28,22 @@ config MMU
        bool
        default y
 
+config UML_DMA_EMULATION
+       bool
+
 config NO_IOMEM
+       bool "disable IOMEM" if EXPERT
+       depends on !INDIRECT_IOMEM
+       default y
+
+config UML_IOMEM_EMULATION
+       bool
+       select INDIRECT_IOMEM
+       select GENERIC_PCI_IOMAP
+       select GENERIC_IOMAP
+       select NO_GENERIC_PCI_IOPORT_MAP
+
+config NO_IOPORT_MAP
        def_bool y
 
 config ISA
@@ -61,6 +78,9 @@ config NR_CPUS
        range 1 1
        default 1
 
+config ARCH_HAS_CACHE_LINE_SIZE
+       def_bool y
+
 source "arch/$(HEADER_ARCH)/um/Kconfig"
 
 config MAY_HAVE_RUNTIME_DEPS
@@ -91,6 +111,19 @@ config LD_SCRIPT_DYN
        depends on !LD_SCRIPT_STATIC
        select MODULE_REL_CRCS if MODVERSIONS
 
+config LD_SCRIPT_DYN_RPATH
+       bool "set rpath in the binary" if EXPERT
+       default y
+       depends on LD_SCRIPT_DYN
+       help
+         Add /lib (and /lib64 for 64-bit) to the linux binary's rpath
+         explicitly.
+
+         You may need to turn this off if compiling for nix systems
+         that have their libraries in random /nix directories and
+         might otherwise unexpected use libraries from /lib or /lib64
+         instead of the desired ones.
+
 config HOSTFS
        tristate "Host filesystem"
        help