Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d48015f authored by Rich Wiley's avatar Rich Wiley Committed by Ruchi Kandoi
Browse files

arm64: make SCTLR compat config depend on CONFIG_ARMV7_COMPAT 



Conflicts:
	arch/arm64/mm/proc.S

Change-Id: I76e0067839c96e3082b42c80d3fc670cf3d371b5
Signed-off-by: default avatarRich Wiley <rwiley@nvidia.com>
Reviewed-on: http://git-master/r/422173


GVS: Gerrit_Virtual_Submit
Reviewed-by: default avatarAlexander Van Brunt <avanbrunt@nvidia.com>
Reviewed-by: default avatarBharat Nihalani <bnihalani@nvidia.com>
Tested-by: default avatarBharat Nihalani <bnihalani@nvidia.com>
parent 2ec6f254

arch/arm64/Kconfig

+0 −14
Original line number Diff line number Diff line
@@ -375,20 +375,6 @@ config ARCH_WANT_HUGE_PMD_SHARE 
config HAVE_ARCH_TRANSPARENT_HUGEPAGE

	def_bool y



config ARMV7_COMPAT_CP15_BARRIER

	bool "Allow applications to use the CP15 barrier operations"

	depends on ARMV7_COMPAT

	default y

	help

	 This option allows applications to use deprecated CP15 barrier

	 instructions. This is useful because this was the only way to create

	 a barrier on older ARM processors.



	 If you want to execute ARMv7 applications, say Y



config ARCH_HAS_CACHE_LINE_SIZE

	def_bool y



source "mm/Kconfig"



config XEN_DOM0

arch/arm64/mm/proc.S

+1 −1
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ ENTRY(__cpu_setup) 
	ret					// return to head.S

ENDPROC(__cpu_setup)



#ifdef CONFIG_ARMV7_COMPAT_CP15_BARRIER

#ifdef CONFIG_ARMV7_COMPAT

	/*

	 *                 n n            T

	 *       U E      WT T UD     US IHBS