From: Greg Kroah-Hartman Date: Sat, 14 Dec 2013 00:26:54 +0000 (-0800) Subject: 3.12-stable patches X-Git-Tag: v3.4.75~50 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=94964f4595fce2cd1951648b6c92af4a84b1029a;p=thirdparty%2Fkernel%2Fstable-queue.git 3.12-stable patches added patches: arm64-mm-fix-pmd_sect_prot_none-definition.patch --- diff --git a/queue-3.12/arm64-mm-fix-pmd_sect_prot_none-definition.patch b/queue-3.12/arm64-mm-fix-pmd_sect_prot_none-definition.patch new file mode 100644 index 00000000000..84df3b8a0d3 --- /dev/null +++ b/queue-3.12/arm64-mm-fix-pmd_sect_prot_none-definition.patch @@ -0,0 +1,31 @@ +From db4ed53cfe9f5a00355891a631d47dfa3fd4541f Mon Sep 17 00:00:00 2001 +From: Steve Capper +Date: Thu, 5 Dec 2013 12:04:51 +0000 +Subject: arm64: mm: Fix PMD_SECT_PROT_NONE definition + +From: Steve Capper + +commit db4ed53cfe9f5a00355891a631d47dfa3fd4541f upstream. + +Modify the value of PMD_SECT_PROT_NONE to match that of PTE_NONE. This +should have been in commit 3676f9ef5481 (Move PTE_PROT_NONE higher up). + +Signed-off-by: Steve Capper +Signed-off-by: Catalin Marinas +Signed-off-by: Greg Kroah-Hartman + +--- + arch/arm64/include/asm/pgtable-hwdef.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/arm64/include/asm/pgtable-hwdef.h ++++ b/arch/arm64/include/asm/pgtable-hwdef.h +@@ -43,7 +43,7 @@ + * Section + */ + #define PMD_SECT_VALID (_AT(pmdval_t, 1) << 0) +-#define PMD_SECT_PROT_NONE (_AT(pmdval_t, 1) << 2) ++#define PMD_SECT_PROT_NONE (_AT(pmdval_t, 1) << 58) + #define PMD_SECT_USER (_AT(pmdval_t, 1) << 6) /* AP[1] */ + #define PMD_SECT_RDONLY (_AT(pmdval_t, 1) << 7) /* AP[2] */ + #define PMD_SECT_S (_AT(pmdval_t, 3) << 8) diff --git a/queue-3.12/series b/queue-3.12/series new file mode 100644 index 00000000000..13d4794555d --- /dev/null +++ b/queue-3.12/series @@ -0,0 +1 @@ +arm64-mm-fix-pmd_sect_prot_none-definition.patch