diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-12-08 18:02:04 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-12-08 18:02:04 +0000 |
| commit | 6ae25a5b9d7ba86d6ac19c403dfa57dae6caa73d (patch) | |
| tree | 41d04269f268d6162e5f1866496dd42fbc79d2a4 /arch/arm/mm/proc-macros.S | |
| parent | 3ee0fc5ca129cbae81c073756febcb1c552af446 (diff) | |
| parent | 497b7e943d0dc5743454de56dcdb67352bbf96b2 (diff) | |
| download | linux-6ae25a5b9d7ba86d6ac19c403dfa57dae6caa73d.tar.gz linux-6ae25a5b9d7ba86d6ac19c403dfa57dae6caa73d.tar.bz2 linux-6ae25a5b9d7ba86d6ac19c403dfa57dae6caa73d.zip | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux into devel-stable
Conflicts:
arch/arm/mm/ioremap.c
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 307a4def8d3a..2d8ff3ad86d3 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 */ |