ARM: config: mutual exclusive CPA & LPAE
Bibek Basu [Fri, 27 Sep 2013 11:12:05 +0000 (16:12 +0530)]
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>

arch/arm/mm/Kconfig

index 93028fe..28906c3 100644 (file)
@@ -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,