diff options
| author | Rich Wiley <rwiley@nvidia.com> | 2014-06-04 11:41:53 -0700 |
|---|---|---|
| committer | Riham Haidar <rhaidar@nvidia.com> | 2014-06-13 17:59:38 -0700 |
| commit | fa0029b23ec69e1f2fd1d0e5e1842135b472529d (patch) | |
| tree | 79b282e5b3794032711f55f89fa0884dcda0283e /arch/arm64 | |
| parent | 6333c7e2782b9ee1503eeb591a2d4ff0bb0062c3 (diff) | |
arm64: make SCTLR compat config depend on CONFIG_ARMV7_COMPAT
Conflicts:
arch/arm64/mm/proc.S
Bug 200004840
Change-Id: I76e0067839c96e3082b42c80d3fc670cf3d371b5
Signed-off-by: Rich Wiley <rwiley@nvidia.com>
Reviewed-on: http://git-master/r/422173
GVS: Gerrit_Virtual_Submit
Reviewed-by: Alexander Van Brunt <avanbrunt@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Tested-by: Bharat Nihalani <bnihalani@nvidia.com>
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/Kconfig | 11 | ||||
| -rw-r--r-- | arch/arm64/mm/proc.S | 2 |
2 files changed, 1 insertions, 12 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 61cd81cad4d8..5502d6fc1cac 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -332,17 +332,6 @@ config ARMV7_COMPAT_CPUINFO 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 0214dc743cb1..bdb3dafe78d2 100644 --- a/arch/arm64/mm/proc.S +++ b/arch/arm64/mm/proc.S @@ -220,7 +220,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 |