arm64: hibernate: add PUD_SECT_RDONLY

There is PMD_SECT_RDONLY that is used in pud_* function which is confusing.

Signed-off-by: Pavel Tatashin <pasha.tatashin@soleen.com>
Acked-by: James Morse <james.morse@arm.com>
Signed-off-by: Will Deacon <will@kernel.org>

diff --git a/arch/arm64/include/asm/pgtable-hwdef.h b/arch/arm64/include/asm/pgtable-hwdef.h
index d9fbd433cc1753258c28176592e5383565fd3c7f..9961c7cee9c50bf6df761aabebcb3d1241d66212 100644 (file)
--- a/arch/arm64/include/asm/pgtable-hwdef.h
+++ b/arch/arm64/include/asm/pgtable-hwdef.h
@@ -110,6 +110,7 @@
 #define PUD_TABLE_BIT          (_AT(pudval_t, 1) << 1)
 #define PUD_TYPE_MASK          (_AT(pudval_t, 3) << 0)
 #define PUD_TYPE_SECT          (_AT(pudval_t, 1) << 0)
+#define PUD_SECT_RDONLY                (_AT(pudval_t, 1) << 7)         /* AP[2] */
 
 /*
  * Level 2 descriptor (PMD).

diff --git a/arch/arm64/kernel/hibernate.c b/arch/arm64/kernel/hibernate.c
index 1ca8af685e961cd91776043529baad79cfd47c64..ce60bceed35747605cd283cec149953eb153e0b0 100644 (file)
--- a/arch/arm64/kernel/hibernate.c
+++ b/arch/arm64/kernel/hibernate.c
@@ -436,7 +436,7 @@ static int copy_pud(pgd_t *dst_pgdp, pgd_t *src_pgdp, unsigned long start,
                                return -ENOMEM;
                } else {
                        set_pud(dst_pudp,
-                               __pud(pud_val(pud) & ~PMD_SECT_RDONLY));
+                               __pud(pud_val(pud) & ~PUD_SECT_RDONLY));
                }
        } while (dst_pudp++, src_pudp++, addr = next, addr != end);