From: Mark Brown <broonie@kernel.org>
Date: Mon, 9 Feb 2015 06:11:45 +0000 (+0800)
Subject: Merge tag 'v3.10.68' into linux-linaro-lsk
X-Git-Tag: firefly_0821_release~3680^2~27^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ceafc84623c8ef94c13a87363277a595988b2b79;p=firefly-linux-kernel-4.4.55.git

Merge tag 'v3.10.68' into linux-linaro-lsk

This is the 3.10.68 stable release
---

ceafc84623c8ef94c13a87363277a595988b2b79
diff --cc arch/arm/include/asm/pgtable-3level-hwdef.h
index f088c864c992,add785b1ec0a..5d9f086e18cd
--- a/arch/arm/include/asm/pgtable-3level-hwdef.h
+++ b/arch/arm/include/asm/pgtable-3level-hwdef.h
@@@ -69,9 -66,9 +69,10 @@@
  #define PTE_TYPE_MASK		(_AT(pteval_t, 3) << 0)
  #define PTE_TYPE_FAULT		(_AT(pteval_t, 0) << 0)
  #define PTE_TYPE_PAGE		(_AT(pteval_t, 3) << 0)
 +#define PTE_TABLE_BIT		(_AT(pteval_t, 1) << 1)
  #define PTE_BUFFERABLE		(_AT(pteval_t, 1) << 2)		/* AttrIndx[0] */
  #define PTE_CACHEABLE		(_AT(pteval_t, 1) << 3)		/* AttrIndx[1] */
+ #define PTE_AP2			(_AT(pteval_t, 1) << 7)		/* AP[2] */
  #define PTE_EXT_SHARED		(_AT(pteval_t, 3) << 8)		/* SH[1:0], inner shareable */
  #define PTE_EXT_AF		(_AT(pteval_t, 1) << 10)	/* Access Flag */
  #define PTE_EXT_NG		(_AT(pteval_t, 1) << 11)	/* nG */
diff --cc arch/arm/include/asm/pgtable-3level.h
index c5d94b31bde4,bb017328c5bd..0ea7f99f6d76
--- a/arch/arm/include/asm/pgtable-3level.h
+++ b/arch/arm/include/asm/pgtable-3level.h
@@@ -82,16 -74,11 +82,16 @@@
  #define L_PTE_SHARED		(_AT(pteval_t, 3) << 8)		/* SH[1:0], inner shareable */
  #define L_PTE_YOUNG		(_AT(pteval_t, 1) << 10)	/* AF */
  #define L_PTE_XN		(_AT(pteval_t, 1) << 54)	/* XN */
- #define L_PTE_DIRTY		(_AT(pteval_t, 1) << 55)	/* unused */
- #define L_PTE_SPECIAL		(_AT(pteval_t, 1) << 56)	/* unused */
+ #define L_PTE_DIRTY		(_AT(pteval_t, 1) << 55)
+ #define L_PTE_SPECIAL		(_AT(pteval_t, 1) << 56)
  #define L_PTE_NONE		(_AT(pteval_t, 1) << 57)	/* PROT_NONE */
+ #define L_PTE_RDONLY		(_AT(pteval_t, 1) << 58)	/* READ ONLY */
  
 +#define PMD_SECT_VALID		(_AT(pmdval_t, 1) << 0)
 +#define PMD_SECT_DIRTY		(_AT(pmdval_t, 1) << 55)
 +#define PMD_SECT_SPLITTING	(_AT(pmdval_t, 1) << 56)
 +#define PMD_SECT_NONE		(_AT(pmdval_t, 1) << 57)
 +
  /*
   * To be used in assembly code with the upper page attributes.
   */