[kernel] r9552 - in dists/sid/linux-2.6/debian: . patches/bugfix/mips patches/series

[Martin Michlmayr]

Author: tbm
Date: Wed Sep 26 06:19:05 2007
New Revision: 9552

Log:
Backport "Fix CONFIG_BUILD_ELF64 kernels with symbols in
CKSEG0" to fix crash on boot on IP32 (SGI O2).  Closes: #444104.


Added:
   dists/sid/linux-2.6/debian/patches/bugfix/mips/fix-build-elf64.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/5

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Wed Sep 26 06:19:05 2007
@@ -30,6 +30,8 @@
   [ Martin Michlmayr ]
   * [mips] Add a fix so qemu NE2000 will work again.
   * [mipsel/r5k-cobalt] Enable MTD.
+  * [mips] Backport "Fix CONFIG_BUILD_ELF64 kernels with symbols in
+    CKSEG0" to fix crash on boot on IP32 (SGI O2).  Closes: #444104.
 
   [ Steve Langasek ]
   * Set CONFIG_MATHEMU=y on alpha, which is required for proper fp math on

Added: dists/sid/linux-2.6/debian/patches/bugfix/mips/fix-build-elf64.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/mips/fix-build-elf64.patch	Wed Sep 26 06:19:05 2007
@@ -0,0 +1,26 @@
+This is a backport of http://www.linux-mips.org/g/linux/db423f6e (which
+will be in 2.6.23) to 2.6.22:
+
+
+[MIPS] Fix CONFIG_BUILD_ELF64 kernels with symbols in CKSEG0.
+
+Ralf Baechle [Tue, 11 Sep 2007 07:50:40 +0000 (08:50 +0100)]
+
+The __pa() for those did assume that all symbols have XKPHYS values and
+the math fails for any other address range.
+
+Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
+
+
+--- a/include/asm-mips/page.h	2007-09-26 05:51:10.000000000 +0000
++++ b/include/asm-mips/page.h	2007-09-26 05:51:24.000000000 +0000
+@@ -149,7 +149,7 @@
+ /*
+  * __pa()/__va() should be used only during mem init.
+  */
+-#if defined(CONFIG_64BIT) && !defined(CONFIG_BUILD_ELF64)
++#ifdef CONFIG_64BIT
+ #define __pa_page_offset(x)	((unsigned long)(x) < CKSEG0 ? PAGE_OFFSET : CKSEG0)
+ #else
+ #define __pa_page_offset(x)	PAGE_OFFSET
+

Modified: dists/sid/linux-2.6/debian/patches/series/5
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/5	(original)
+++ dists/sid/linux-2.6/debian/patches/series/5	Wed Sep 26 06:19:05 2007
@@ -1,3 +1,4 @@
 - bugfix/sparc/sun4u-pci-config-space.patch
 + bugfix/2.6.22.6-abi
 + bugfix/mips/i8259-disable-method.patch
++ bugfix/mips/fix-build-elf64.patch