]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
3.12-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 14 Dec 2013 00:26:54 +0000 (16:26 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 14 Dec 2013 00:26:54 +0000 (16:26 -0800)
added patches:
arm64-mm-fix-pmd_sect_prot_none-definition.patch

queue-3.12/arm64-mm-fix-pmd_sect_prot_none-definition.patch [new file with mode: 0644]
queue-3.12/series [new file with mode: 0644]

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 (file)
index 0000000..84df3b8
--- /dev/null
@@ -0,0 +1,31 @@
+From db4ed53cfe9f5a00355891a631d47dfa3fd4541f Mon Sep 17 00:00:00 2001
+From: Steve Capper <steve.capper@linaro.org>
+Date: Thu, 5 Dec 2013 12:04:51 +0000
+Subject: arm64: mm: Fix PMD_SECT_PROT_NONE definition
+
+From: Steve Capper <steve.capper@linaro.org>
+
+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 <steve.capper@linaro.org>
+Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ 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 (file)
index 0000000..13d4794
--- /dev/null
@@ -0,0 +1 @@
+arm64-mm-fix-pmd_sect_prot_none-definition.patch