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

[Martin Michlmayr]

Author: tbm
Date: Mon Jul  6 10:07:24 2009
New Revision: 13891

Log:
another mips build fix

Added:
   dists/trunk/linux-2.6/debian/patches/bugfix/mips/fix-smp.patch
Modified:
   dists/trunk/linux-2.6/debian/patches/series/base

Added: dists/trunk/linux-2.6/debian/patches/bugfix/mips/fix-smp.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/mips/fix-smp.patch	Mon Jul  6 10:07:24 2009	(r13891)
@@ -0,0 +1,23 @@
+Commit fc03bc1715ca0ad4ccfe97aab16bcc9e7129c1a4 breaks compiling MIPS
+with SMP disabled.  This patch fixes that.
+
+Signed-off-by: Alexander Clouter <alex at digriz.org.uk>
+---
+ arch/mips/include/asm/gic.h |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/arch/mips/include/asm/gic.h b/arch/mips/include/asm/gic.h
+index 10292e3..a8f5734 100644
+--- a/arch/mips/include/asm/gic.h
++++ b/arch/mips/include/asm/gic.h
+@@ -20,7 +20,7 @@
+ #define GIC_TRIG_EDGE			1
+ #define GIC_TRIG_LEVEL			0
+ 
+-#if CONFIG_SMP
++#ifdef CONFIG_SMP
+ #define GIC_NUM_INTRS			(24 + NR_CPUS * 2)
+ #else
+ #define GIC_NUM_INTRS			32
+-- 
+1.6.3.3

Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base	Mon Jul  6 08:25:18 2009	(r13890)
+++ dists/trunk/linux-2.6/debian/patches/series/base	Mon Jul  6 10:07:24 2009	(r13891)
@@ -25,5 +25,7 @@
 #+ bugfix/all/wireless-regulatory-default-EU.patch
 #+ features/sparc/video-sunxvr500-intergraph.patch
 #+ bugfix/sparc/arch-zimage-target.patch
+### stuff that will hopefully be fixed in the next rc
 + bugfix/arm/export-flush_dcache_page.patch
 + bugfix/all/add-missing-mtd-include.patch
++ bugfix/mips/fix-smp.patch