diff options
author | Christoffer Dall <christoffer.dall@linaro.org> | 2014-02-02 22:21:31 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-02-10 11:44:05 +0000 |
commit | 4d9c5b89cf3605bbc39c6e274351ff25f0d83e6a (patch) | |
tree | 373136b67684e57583226d09149fff10cb2db5f5 /arch/arm/mm/mm.h | |
parent | 87f9260bf1fb7ec4c3f88c6bb353df17ca1e1c19 (diff) | |
download | linux-4d9c5b89cf3605bbc39c6e274351ff25f0d83e6a.tar.gz linux-4d9c5b89cf3605bbc39c6e274351ff25f0d83e6a.tar.bz2 linux-4d9c5b89cf3605bbc39c6e274351ff25f0d83e6a.zip |
ARM: 7950/1: mm: Fix stage-2 device memory attributes
The stage-2 memory attributes are distinct from the Hyp memory
attributes and the Stage-1 memory attributes. We were using the stage-1
memory attributes for stage-2 mappings causing device mappings to be
mapped as normal memory. Add the S2 equivalent defines for memory
attributes and fix the comments explaining the defines while at it.
Add a prot_pte_s2 field to the mem_type struct and fill out the field
for device mappings accordingly.
Cc: <stable@vger.kernel.org> [3.9+]
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mm/mm.h')
-rw-r--r-- | arch/arm/mm/mm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mm/mm.h b/arch/arm/mm/mm.h index d5a982d15a88..7ea641b7aa7d 100644 --- a/arch/arm/mm/mm.h +++ b/arch/arm/mm/mm.h @@ -38,6 +38,7 @@ static inline pmd_t *pmd_off_k(unsigned long virt) struct mem_type { pteval_t prot_pte; + pteval_t prot_pte_s2; pmdval_t prot_l1; pmdval_t prot_sect; unsigned int domain; |