From: Rich Wiley Date: Wed, 4 Jun 2014 18:41:53 +0000 (-0700) Subject: arm64: make SCTLR compat config depend on CONFIG_ARMV7_COMPAT X-Git-Tag: firefly_0821_release~4090^2~209 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=bad15588d39c24ecb76593f632a0ab5d71ace7ed;p=firefly-linux-kernel-4.4.55.git arm64: make SCTLR compat config depend on CONFIG_ARMV7_COMPAT Conflicts: arch/arm64/mm/proc.S Change-Id: I76e0067839c96e3082b42c80d3fc670cf3d371b5 Signed-off-by: Rich Wiley Reviewed-on: http://git-master/r/422173 GVS: Gerrit_Virtual_Submit Reviewed-by: Alexander Van Brunt Reviewed-by: Bharat Nihalani Tested-by: Bharat Nihalani --- diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 0df94f10cda6..787cee384e1c 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -218,17 +218,6 @@ config ARMV7_COMPAT If you want to execute ARMv7 applications, say 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 - source "mm/Kconfig" endmenu diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S index 48fffb27a7bf..9796b33a708b 100644 --- a/arch/arm64/mm/proc.S +++ b/arch/arm64/mm/proc.S @@ -160,7 +160,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