diff options
| author | Bibek Basu <bbasu@nvidia.com> | 2013-09-27 16:42:05 +0530 |
|---|---|---|
| committer | Ajay Nandakumar <anandakumarm@nvidia.com> | 2013-10-03 19:17:43 +0530 |
| commit | ba620d83dc0ffeb8361e39371e0984c374837220 (patch) | |
| tree | 0407af46bf09e9b258a59df29efe67521f3a5fce /arch/arm/mm | |
| parent | aebcac70ac202028dcbbbe6ffe6a57e234e270f1 (diff) | |
ARM: config: mutual exclusive CPA & LPAE
Make CONFIG_CPA and CONFIG_ARM_LPAE
mutually exclusive.
Bug 1374612
Change-Id: I1ec2dbe316a52633d19d122d42e18103a838c960
Signed-off-by: Bibek Basu <bbasu@nvidia.com>
Reviewed-on: http://git-master/r/279798
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Kiran Adduri <kadduri@nvidia.com>
Reviewed-by: Matt Craighead <mcraighead@nvidia.com>
Reviewed-by: Krishna Reddy <vdumpa@nvidia.com>
Reviewed-by: Adeel Raza <araza@nvidia.com>
Tested-by: Adeel Raza <araza@nvidia.com>
Reviewed-by: Alexander Van Brunt <avanbrunt@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
(cherry picked from commit 8b550aba000043ff10d9127a082c9faa7e85fcad)
Signed-off-by: Ajay Nandakumar <anandakumarm@nvidia.com>
Diffstat (limited to 'arch/arm/mm')
| -rw-r--r-- | arch/arm/mm/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index 93028fe277cf..28906c3f6bb4 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig @@ -951,7 +951,7 @@ config ARM_SAVE_DEBUG_CONTEXT_NO_LOCK config CPA bool "Change Page Attributes" - depends on CPU_V7 + depends on CPU_V7 && !ARM_LPAE help This option enables Changing Page Attibutes for low memory. This is needed to avoid conflicting memory mappings for low memory, |