]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.4-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 20 Jun 2016 22:09:44 +0000 (15:09 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 20 Jun 2016 22:09:44 +0000 (15:09 -0700)
added patches:
mips-fix-64k-page-support-for-32-bit-kernels.patch

queue-3.14/mips-fix-64k-page-support-for-32-bit-kernels.patch [new file with mode: 0644]
queue-3.14/series
queue-4.4/mips-fix-64k-page-support-for-32-bit-kernels.patch [new file with mode: 0644]
queue-4.4/series

diff --git a/queue-3.14/mips-fix-64k-page-support-for-32-bit-kernels.patch b/queue-3.14/mips-fix-64k-page-support-for-32-bit-kernels.patch
new file mode 100644 (file)
index 0000000..3abb574
--- /dev/null
@@ -0,0 +1,33 @@
+From d7de413475f443957a0c1d256e405d19b3a2cb22 Mon Sep 17 00:00:00 2001
+From: Ralf Baechle <ralf@linux-mips.org>
+Date: Thu, 4 Feb 2016 01:24:40 +0100
+Subject: MIPS: Fix 64k page support for 32 bit kernels.
+
+From: Ralf Baechle <ralf@linux-mips.org>
+
+commit d7de413475f443957a0c1d256e405d19b3a2cb22 upstream.
+
+TASK_SIZE was defined as 0x7fff8000UL which for 64k pages is not a
+multiple of the page size.  Somewhere further down the math fails
+such that executing an ELF binary fails.
+
+Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
+Tested-by: Joshua Henderson <joshua.henderson@microchip.com>
+Cc: James Hogan <james.hogan@imgtec.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/mips/include/asm/processor.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/mips/include/asm/processor.h
++++ b/arch/mips/include/asm/processor.h
+@@ -51,7 +51,7 @@ extern unsigned int vced_count, vcei_cou
+  * User space process size: 2GB. This is hardcoded into a few places,
+  * so don't change it unless you know what you are doing.
+  */
+-#define TASK_SIZE     0x7fff8000UL
++#define TASK_SIZE     0x80000000UL
+ #endif
+ #ifdef __KERNEL__
index f2ea8058d9826834438734bc2e594db0fd7ef098..358a7288caa08bcdaf9a3feabfff7608dbdddc20 100644 (file)
@@ -10,3 +10,4 @@ parisc-fix-pagefault-crash-in-unaligned-__get_user-call.patch
 ecryptfs-forbid-opening-files-without-mmap-handler.patch
 wext-fix-32-bit-iwpriv-compatibility-issue-with-64-bit-kernel.patch
 fix-d_walk-non-delayed-__d_free-race.patch
+mips-fix-64k-page-support-for-32-bit-kernels.patch
diff --git a/queue-4.4/mips-fix-64k-page-support-for-32-bit-kernels.patch b/queue-4.4/mips-fix-64k-page-support-for-32-bit-kernels.patch
new file mode 100644 (file)
index 0000000..1cd2ad3
--- /dev/null
@@ -0,0 +1,33 @@
+From d7de413475f443957a0c1d256e405d19b3a2cb22 Mon Sep 17 00:00:00 2001
+From: Ralf Baechle <ralf@linux-mips.org>
+Date: Thu, 4 Feb 2016 01:24:40 +0100
+Subject: MIPS: Fix 64k page support for 32 bit kernels.
+
+From: Ralf Baechle <ralf@linux-mips.org>
+
+commit d7de413475f443957a0c1d256e405d19b3a2cb22 upstream.
+
+TASK_SIZE was defined as 0x7fff8000UL which for 64k pages is not a
+multiple of the page size.  Somewhere further down the math fails
+such that executing an ELF binary fails.
+
+Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
+Tested-by: Joshua Henderson <joshua.henderson@microchip.com>
+Cc: James Hogan <james.hogan@imgtec.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/mips/include/asm/processor.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/mips/include/asm/processor.h
++++ b/arch/mips/include/asm/processor.h
+@@ -45,7 +45,7 @@ extern unsigned int vced_count, vcei_cou
+  * User space process size: 2GB. This is hardcoded into a few places,
+  * so don't change it unless you know what you are doing.
+  */
+-#define TASK_SIZE     0x7fff8000UL
++#define TASK_SIZE     0x80000000UL
+ #endif
+ #define STACK_TOP_MAX TASK_SIZE
index 208639da77917089bc875c12db81c631717aa2f5..40b3fee13543b04d12a9e70355aad710435f2a7a 100644 (file)
@@ -57,3 +57,4 @@ sparc64-reduce-tlb-flushes-during-hugepte-changes.patch
 sparc64-take-ctx_alloc_lock-properly-in-hugetlb_setup.patch
 sparc-harden-signal-return-frame-checks.patch
 sparc64-fix-return-from-trap-window-fill-crashes.patch
+mips-fix-64k-page-support-for-32-bit-kernels.patch