diff options
author | John Stultz <john.stultz@linaro.org> | 2011-11-11 15:29:25 -0800 |
---|---|---|
committer | John Stultz <john.stultz@linaro.org> | 2011-11-11 15:29:25 -0800 |
commit | c3e5127312f97482a6a09c0df602c726675eff5b (patch) | |
tree | 9082d8201a1daac5ff019ef50322d551711eb250 /arch/arm/mm/proc-macros.S | |
parent | 5e537f041bd05cddee0d2a2fb3013ee642064cc6 (diff) | |
parent | f171dfebbdf1de4b6ca267285739e190f95f84cc (diff) |
Merge branch 'upstream/linaro-3.1' into linaro-android-3.1-agreen-rebaselinux-linaro-3.1-2011.11-0-android-0
Diffstat (limited to 'arch/arm/mm/proc-macros.S')
-rw-r--r-- | arch/arm/mm/proc-macros.S | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mm/proc-macros.S b/arch/arm/mm/proc-macros.S index 307a4def8d3..2d8ff3ad86d 100644 --- a/arch/arm/mm/proc-macros.S +++ b/arch/arm/mm/proc-macros.S @@ -91,8 +91,9 @@ #if L_PTE_SHARED != PTE_EXT_SHARED #error PTE shared bit mismatch #endif -#if (L_PTE_XN+L_PTE_USER+L_PTE_RDONLY+L_PTE_DIRTY+L_PTE_YOUNG+\ - L_PTE_FILE+L_PTE_PRESENT) > L_PTE_SHARED +#if !defined (CONFIG_ARM_LPAE) && \ + (L_PTE_XN+L_PTE_USER+L_PTE_RDONLY+L_PTE_DIRTY+L_PTE_YOUNG+\ + L_PTE_FILE+L_PTE_PRESENT) > L_PTE_SHARED #error Invalid Linux PTE bit settings #endif #endif /* CONFIG_MMU */ |