[kernel] r21980 - in dists/sid/linux/debian: . patches patches/bugfix/mips

[Aurelien Jarno]

Author: aurel32
Date: Mon Oct 27 22:59:47 2014
New Revision: 21980

Log:
[mips*] Only define MAX_PHYSMEM_BITS on Loongson-3, until a better fix
is committed upstream. Fixes Loongson-2 kernel and maybe more. Closes:
#764223.

Added:
   dists/sid/linux/debian/patches/bugfix/mips/MIPS-increase-MAX-PHYSMEM-BITS-on-Loongson-3-only.patch
Modified:
   dists/sid/linux/debian/changelog
   dists/sid/linux/debian/patches/series

Modified: dists/sid/linux/debian/changelog
==============================================================================
--- dists/sid/linux/debian/changelog	Mon Oct 27 22:28:00 2014	(r21979)
+++ dists/sid/linux/debian/changelog	Mon Oct 27 22:59:47 2014	(r21980)
@@ -37,6 +37,9 @@
   [ Aurelien Jarno ]
   * [mips*] Backport a hugetlb fix for Octeon from 3.18.
   * [mips*] Backport math emulation fix for MIPS32r2 from 3.18.
+  * [mips*] Only define MAX_PHYSMEM_BITS on Loongson-3, until a better fix
+    is committed upstream. Fixes Loongson-2 kernel and maybe more. Closes:
+    #764223.
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sat, 11 Oct 2014 21:41:58 +0100
 

Added: dists/sid/linux/debian/patches/bugfix/mips/MIPS-increase-MAX-PHYSMEM-BITS-on-Loongson-3-only.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux/debian/patches/bugfix/mips/MIPS-increase-MAX-PHYSMEM-BITS-on-Loongson-3-only.patch	Mon Oct 27 22:59:47 2014	(r21980)
@@ -0,0 +1,24 @@
+Commit c4617318 broke Loongson-2 support and maybe even more by increasing
+the value of MAX_PHYSMEM_BITS. At it is currently only needed on
+Loongson-3, define it conditionally.
+
+Note: this should be replace by upstream fix when available.
+
+diff --git a/arch/mips/include/asm/sparsemem.h b/arch/mips/include/asm/sparsemem.h
+index b1071c1..778dca7 100644
+--- a/arch/mips/include/asm/sparsemem.h
++++ b/arch/mips/include/asm/sparsemem.h
+@@ -11,7 +11,12 @@
+ #else
+ # define SECTION_SIZE_BITS	28
+ #endif
+-#define MAX_PHYSMEM_BITS	48
++
++#if defined(CONFIG_CPU_LOONGSON3)
++# define MAX_PHYSMEM_BITS	48
++#else
++# define MAX_PHYSMEM_BITS	35
++#endif
+ 
+ #endif /* CONFIG_SPARSEMEM */
+ #endif /* _MIPS_SPARSEMEM_H */

Modified: dists/sid/linux/debian/patches/series
==============================================================================
--- dists/sid/linux/debian/patches/series	Mon Oct 27 22:28:00 2014	(r21979)
+++ dists/sid/linux/debian/patches/series	Mon Oct 27 22:59:47 2014	(r21980)
@@ -56,6 +56,7 @@
 bugfix/arm64/arm64-crypto-fix-makefile-rule-for-aes-glue-.o.patch
 bugfix/mips/MIPS-cp1emu-Fix-ISA-restrictions-for-cop1x_op-instru.patch
 bugfix/mips/MIPS-tlbex-Properly-fix-HUGE-TLB-Refill-exception-ha.patch
+bugfix/mips/MIPS-increase-MAX-PHYSMEM-BITS-on-Loongson-3-only.patch
 
 # Arch features
 features/mips/MIPS-Support-hard-limit-of-cpu-count-nr_cpu_ids.patch