[kernel] r11525 - in dists/trunk/linux-2.6/debian/patches: bugfix/mips series

[Martin Michlmayr]

Author: tbm
Date: Thu Jun  5 11:14:38 2008
New Revision: 11525

Log:
add some mips build fixes


Added:
   dists/trunk/linux-2.6/debian/patches/bugfix/mips/ext4-build-fix.patch
   dists/trunk/linux-2.6/debian/patches/bugfix/mips/malta-build-fix.patch
Modified:
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1

Added: dists/trunk/linux-2.6/debian/patches/bugfix/mips/ext4-build-fix.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/mips/ext4-build-fix.patch	Thu Jun  5 11:14:38 2008
@@ -0,0 +1,40 @@
+From cb55ed7d958cf4abb58dd1d6e46e09447b5694b0 Mon Sep 17 00:00:00 2001
+From: Dmitri Vorobiev <dmitri.vorobiev at gmail.com>
+Date: Mon, 12 May 2008 17:49:19 +0400
+Subject: [PATCH 1/1] [MIPS] Export empty_zero_page as a GPL symbol
+
+The empty_zero_page symbol is needed for the ext4 driver and
+should therefore be exported. This fixes the following error
+reported by Martin Michlmayr:
+
+>>>>>>>
+
+MODPOST 1516 modules
+ERROR: "empty_zero_page" [fs/ext4/ext4dev.ko] undefined!
+
+>>>>>>
+
+Signed-off-by: Dmitri Vorobiev <dmitri.vorobiev at gmail.com>
+---
+ arch/mips/mm/init.c |    5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c
+index ecd562d..618a418 100644
+--- a/arch/mips/mm/init.c
++++ b/arch/mips/mm/init.c
+@@ -70,7 +70,10 @@ DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
+  * any price.  Since page is never written to after the initialization we
+  * don't have to care about aliases on other CPUs.
+  */
+-unsigned long empty_zero_page, zero_page_mask;
++unsigned long empty_zero_page;
++EXPORT_SYMBOL_GPL(empty_zero_page);
++
++unsigned long zero_page_mask;
+ 
+ /*
+  * Not static inline because used by IP27 special magic initialization code
+-- 
+1.5.3
+

Added: dists/trunk/linux-2.6/debian/patches/bugfix/mips/malta-build-fix.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/mips/malta-build-fix.patch	Thu Jun  5 11:14:38 2008
@@ -0,0 +1,63 @@
+On Wed, May 28, 2008 at 05:10:25PM +0200, Martin Michlmayr wrote:
+> * Thomas Bogendoerfer <tsbogend at alpha.franken.de> [2008-05-28 10:50]:
+> > I didn't fix the problems above. The change to traps.c only fixes
+> > traps.c for 64bit builds and it's a totally different issue. Looking
+> > at the warning/errors someone needs to fix some data types and use
+> > CKSEG0ADDR(). I don't have the hardware, so I could only provide an
+> > untested patch, if no one else steps forward...
+> 
+> QEMU emulates Malta, so I (or someone else here) should be able to
+> test the patch.
+
+
+Fix 64bit Malta by using CKSEG0ADDR and correct casts
+
+Signed-off-by: Thomas Bogendoerfer <tsbogend at alpha.franken.de>
+---
+
+ arch/mips/mips-boards/generic/amon.c |    4 ++--
+ include/asm-mips/gic.h               |    4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/arch/mips/mips-boards/generic/amon.c b/arch/mips/mips-boards/generic/amon.c
+index b7633fd..96236bf 100644
+--- a/arch/mips/mips-boards/generic/amon.c
++++ b/arch/mips/mips-boards/generic/amon.c
+@@ -28,7 +28,7 @@
+ 
+ int amon_cpu_avail(int cpu)
+ {
+-	struct cpulaunch *launch = (struct cpulaunch *)KSEG0ADDR(CPULAUNCH);
++	struct cpulaunch *launch = (struct cpulaunch *)CKSEG0ADDR(CPULAUNCH);
+ 
+ 	if (cpu < 0 || cpu >= NCPULAUNCH) {
+ 		pr_debug("avail: cpu%d is out of range\n", cpu);
+@@ -53,7 +53,7 @@ void amon_cpu_start(int cpu,
+ 		    unsigned long gp, unsigned long a0)
+ {
+ 	volatile struct cpulaunch *launch =
+-		(struct cpulaunch  *)KSEG0ADDR(CPULAUNCH);
++		(struct cpulaunch  *)CKSEG0ADDR(CPULAUNCH);
+ 
+ 	if (!amon_cpu_avail(cpu))
+ 		return;
+diff --git a/include/asm-mips/gic.h b/include/asm-mips/gic.h
+index 3a492f2..954807d 100644
+--- a/include/asm-mips/gic.h
++++ b/include/asm-mips/gic.h
+@@ -24,8 +24,8 @@
+ 
+ #define MSK(n) ((1 << (n)) - 1)
+ #define REG32(addr)		(*(volatile unsigned int *) (addr))
+-#define REG(base, offs)		REG32((unsigned int)(base) + offs##_##OFS)
+-#define REGP(base, phys)	REG32((unsigned int)(base) + (phys))
++#define REG(base, offs)		REG32((unsigned long)(base) + offs##_##OFS)
++#define REGP(base, phys)	REG32((unsigned long)(base) + (phys))
+ 
+ /* Accessors */
+ #define GIC_REG(segment, offset) \
+
+
+-- 
+Crap can work. Given enough thrust pigs will fly, but it's not necessary a
+good idea.                                                [ RFC1925, 2.3 ]

Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	Thu Jun  5 11:14:38 2008
@@ -34,3 +34,5 @@
 + bugfix/fix-hifn_795X-divdi3.patch
 + bugfix/all/mtd-prevent-physmap-from-causing-request_module-runaway-loop-modprobe-net-pf-1.patch
 + features/all/0001-iwlwifi-Set-monitor-mode-for-3945.patch
++ bugfix/mips/ext4-build-fix.patch
++ bugfix/mips/malta-build-fix.patch