Merge tag 'arc-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc

[mirror_ubuntu-artful-kernel.git] / arch / arc / Kconfig

diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig
index 07a5cb944d4ff730d1015cdcbff9ffc82d3905f8..208aae071b378550fa47ade47332ec9351f62e43 100644 (file)
--- a/arch/arc/Kconfig
+++ b/arch/arc/Kconfig
@@ -391,7 +391,7 @@ config ARC_HAS_LLSC
 
 config ARC_STAR_9000923308
        bool "Workaround for llock/scond livelock"
-       default y
+       default n
        depends on ISA_ARCV2 && SMP && ARC_HAS_LLSC
 
 config ARC_HAS_SWAPE
@@ -462,7 +462,6 @@ config ARC_HAS_PAE40
        bool "Support for the 40-bit Physical Address Extension"
        default n
        depends on ISA_ARCV2
-       select HIGHMEM
        help
          Enable access to physical memory beyond 4G, only supported on
          ARC cores with 40 bit Physical Addressing support
@@ -473,6 +472,9 @@ config ARCH_PHYS_ADDR_T_64BIT
 config ARCH_DMA_ADDR_T_64BIT
        bool
 
+config ARC_PLAT_NEEDS_PHYS_TO_DMA
+       bool
+
 config ARC_CURR_IN_REG
        bool "Dedicate Register r25 for current_task pointer"
        default y