From: Vineet Gupta <vgupta@synopsys.com>
Date: Tue, 31 May 2016 06:16:47 +0000 (+0530)
Subject: ARC: don't enable DISCONTIGMEM unconditionally
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d140b9bfcad9e53f1da67ad09dd5092b44d55c7b;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

ARC: don't enable DISCONTIGMEM unconditionally

Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
---

diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig
index b14826a4f59c..be9d0b5ae0cc 100644
--- a/arch/arc/Kconfig
+++ b/arch/arc/Kconfig
@@ -61,7 +61,7 @@ config RWSEM_GENERIC_SPINLOCK
 	def_bool y
 
 config ARCH_DISCONTIGMEM_ENABLE
-	def_bool y
+	def_bool n
 
 config ARCH_FLATMEM_ENABLE
 	def_bool y
@@ -453,7 +453,7 @@ config LINUX_LINK_BASE
 
 config HIGHMEM
 	bool "High Memory Support"
-	select DISCONTIGMEM
+	select ARCH_DISCONTIGMEM_ENABLE
 	help
 	  With ARC 2G:2G address split, only upper 2G is directly addressable by
 	  kernel. Enable this to potentially allow access to rest of 2G and PAE